Browse code Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/tanyue/smartwell_qd into dev Conflicts: casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java dev
commit ec522fe46ed8ca777c0707a77bf0185bce8afdc5 2 parents fcc0b3d + e44c9f9 TAN YUE authored on 17 Mar 2022

Showing 14 changed files

• casic-device/pom.xml
• casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
• casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
• casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java
• casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
• casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
• casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
• casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
• casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
• casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
• casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
• casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java
• casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
• casic-web/src/main/resources/config/application.yml

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

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

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

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

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/IDeviceService.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-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java

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

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

Ignore Space Show notes View casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java

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

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

Show line notes below