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 |
---|
casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java |
---|
casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java |
---|
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 |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java |
---|