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 Conflicts: casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java dev
commit 288066ef8458e26a10fe17fdb585f9266865f417 2 parents 4558877 + 95d8421 casic_zt authored on 14 Jun 2023

Patch

Unified Split

Showing 5 changed files

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

Ignore Space Show notes View casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmCancelRequest.java

Ignore Space Show notes View casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordResponse.java

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

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

Show line notes below