Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/casic_iris_parent into dev111
commit de3bdb00208797ce04c6886071bd424fbad9b1be
2 parents 631cefc + 2d10582
zhangyingjie authored on 15 Jul 2020
Showing 4 changed files
View
casic-iris-atd/src/main/java/com/casic/missiles/modular/system/controller/SyncController.java
View
casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java
View
casic-web/src/main/java/com/casic/missiles/CasicApplication.java
View
casic-web/src/main/resources/config/application-dev.yml