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 Conflicts: casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java master
commit ef6c58a55862573c03d4f70805758df8525737cb 2 parents 15fb012 + 0dcd5c6 casic_zt authored on 23 May 2024

Patch

Unified Split

Showing 3 changed files

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java

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

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

Show line notes below