Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/zhoutian/casic-PTZ into dev

Fork: 0

zhoutian / casic-PTZ

Browse code Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/zhoutian/casic-PTZ into dev dev
commit 6985510b25a88a85e8be2895a5f0d3112b25e8d8 2 parents 84cfed4 + b33d847 casic_zt authored on 4 May 2023

Patch

Unified Split

Showing 6 changed files

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

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java

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

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

Ignore Space Show notes View casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorOverviewMap.java

Ignore Space Show notes View casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java

Show line notes below