Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/tanyue/smartwell_qd into dev

Fork: 0

tanyue / smartwell_qd

Browse code Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/tanyue/smartwell_qd into dev dev
commit 06311276416a0779e7a413ea56becf368001a9e2 2 parents 43ce1a2 + 305fb6c TAN YUE authored on 23 Mar 2022

Patch

Unified Split

Showing 10 changed files

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java

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

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

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

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

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

Show line notes below