Merge branch 'dev' of http://192.168.0.203:8080/gitbucket/git/root/casic-iris-parent into dev

Fork: 0

codedev / casic_iris_parent_gz

Browse code Merge branch 'dev' of http://192.168.0.203:8080/gitbucket/git/root/casic-iris-parent into dev dev master V1.3.1 V1.3.0 V1.1.3 V1.1.2 V1.0.4-en V1.0.3-en V1.0.2
commit dd4fa9137ff54f1c03d0decce7aab8a09181a443 2 parents 5718ec5 + 7472f66 lwh authored on 16 Dec 2019

Patch

Unified Split

Showing 11 changed files

Ignore Space Show notes View casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java

Ignore Space Show notes View casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StrategyController.java

Ignore Space Show notes View casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java

Ignore Space Show notes View casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml

Ignore Space Show notes View casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml

Ignore Space Show notes View casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Strategy.java

Ignore Space Show notes View casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java

Ignore Space Show notes View casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/AcsPermissionServiceImpl.java

Ignore Space Show notes View casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java

Ignore Space Show notes View casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java

Ignore Space Show notes View casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java

Show line notes below