Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/zhoutian/smartwell_Webbr into dev

Fork: 0

zhoutian / smartwell_Webbr

Browse code Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/zhoutian/smartwell_Webbr into dev Conflicts: casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java dev
commit 33ed195d7b8f1dab8eac900480e8f1ac3d268416 2 parents c9dc328 + 3fbfb50 casic_zt authored on 26 Nov 2022

Patch

Unified Split

Showing 10 changed files

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

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/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/dto/DeviceDto.java

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/mapping/BusWellInfoMapper.xml

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

Show line notes below