Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/zhoutian/casic-PTZ into dev
Conflicts:
	casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
	casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
dev
commit 8cfb9e587bd584183f70c972284d758d650f512f
2 parents 0739ecb + 2c9c3a8
casic_zt authored on 11 May 2023
Showing 8 changed files
View
casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
View
casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
View
casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java