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 8a80342f4db2c8bfe128f95548557c5a46c2133b 2 parents 361ee31 + 523854a IRIS authored on 9 Dec 2019

Patch

Unified Split

Showing 49 changed files

Ignore Space Show notes View casic-iris-acs/pom.xml

Ignore Space Show notes View casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java 0 → 100644

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/PersonController.java

Ignore Space Show notes View casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.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/AcsPermissionMapper.java 0 → 100644

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

Ignore Space Show notes View casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.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 0 → 100644

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

Ignore Space Show notes View casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.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/enums/PersonTypeEnums.java 0 → 100644

Ignore Space Show notes View casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/AcsPermission.java 0 → 100644

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

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

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

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/IAcsPermissionService.java 0 → 100644

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

Ignore Space Show notes View casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.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/IStrategyService.java

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

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/PersonServiceImpl.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-acs/src/main/java/com/casic/missiles/modular/system/service/impl/StrategyServiceImpl.java

Ignore Space Show notes View casic-iris-acs/src/main/java/com/casic/missiles/modular/system/warpper/AcsPermissionWarpper.java 0 → 100644

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View casic-web/pom.xml

Ignore Space Show notes View casic-web/src/main/bin/虹膜门禁.bat

Ignore Space Show notes View casic-web/src/main/java/com/casic/missiles/controller/TableTestController.java

Ignore Space Show notes View casic-web/src/main/resources/config/application-dev.yml

Ignore Space Show notes View casic-web/src/main/resources/config/application-test.yml

Ignore Space Show notes View pom.xml

Show line notes below