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

Fork: 0

smartwell2.0 / casic-smartcity

Browse code Merge branch 'master' of http://111.198.10.15:12003/gitbucket/git/smartwell2.0/casic-smartcity dz gz master zq
commit 3b6598ea1d464c6ec7cea3baa74979bd8059e6af 2 parents 4b83d7a + 9e94872 ChaiZhuang authored on 25 Jul 2022

Patch

Unified Split

Showing 11 changed files

Ignore Space Show notes View casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.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/ThirdPartyDataMapper.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/dao/mapping/ThirdPartyDataMapper.xml

Ignore Space Show notes View casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.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-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.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/mapping/DeviceMapper.xml

Ignore Space Show notes View casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java

Show line notes below