Merge branch 'dev' of http://192.168.0.203:8080/gitbucket/git/root/casic-iris-parent into dev
commit a410e481ec355fc96b8b82c3818311351fe08295
2 parents e846aa6 + 041a3bc
IRIS authored on 23 Dec 2019
Showing 7 changed files
View
casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java
View
casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java
View
casic-iris-acs/src/main/java/com/casic/missiles/modular/system/enums/AcsExportEnum.java 0 → 100644
View
casic-iris-acs/src/main/java/com/casic/missiles/modular/system/enums/ExportEnum.java 100644 → 0
View
casic-web/src/main/resources/config/application-dev.yml
View
casic-web/src/main/resources/config/application-prod.yml
View
casic-web/src/main/resources/config/temp/visitorTemp.xlsx 0 → 100644
Not supported