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 3c2b4b85578de1fcbad63b9ae8eeec93130a366f 2 parents d541b41 + 08b9f60 ChaiZhuang authored on 25 Jul 2022

Patch

Unified Split

Showing 12 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/controller/DeviceWellDataController.java

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

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/service/DeviceDataListService.java

Ignore Space Show notes View casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.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/IDataAnalysisServiceImpl.java

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

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

Show line notes below