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
commit c40cb3496e334110dbffcc4b0dfbe866a6204ae5 2 parents 1826851 + 66acb29 IRIS authored on 22 May 2020

Patch

Unified Split

Showing 8 changed files

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/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/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-support/src/main/java/com/casic/missiles/modular/system/model/Device.java 0 → 100644

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

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

Show line notes below