Merge branch 'zq' of http://111.198.10.15:12003/gitbucket/git/smartwell2.0/casic-smartcity into zq

Fork: 0

smartwell2.0 / casic-smartcity

Browse code Merge branch 'zq' of http://111.198.10.15:12003/gitbucket/git/smartwell2.0/casic-smartcity into zq Conflicts: casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml master zq
commit fbe6152de23dae5584d5ed9d9c50a79c2225e8ec 2 parents e415e0c + 5c35206 casic_zt authored on 24 Jan 2024

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java

Ignore Space Show notes View casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java

Ignore Space Show notes View casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml

Ignore Space Show notes View casic-data-analysis/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataExportEnum.java

Ignore Space Show notes View casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java

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

Show line notes below