Merge branch 'master' of http://111.198.10.15:12003/gitbucket/git/zhoutian/casic

Fork: 0

zhoutian / casic_correlator

Browse code Merge branch 'master' of http://111.198.10.15:12003/gitbucket/git/zhoutian/casic_correlator Conflicts: casic-server/src/main/java/com/casic/missiles/modular/system/dao/NoiseMapper.java casic-server/src/main/java/com/casic/missiles/modular/system/service/INoiseService.java casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/NoiseServiceImpl.java master
commit f26e04410cab3efb3e16df81774668146e477e6f 2 parents ffa18ab + e209654 casic_zt authored on 24 May 2024

Browse code

Merge branch 'master' of http://111.198.10.15:12003/gitbucket/git/zhoutian/casic_correlator

Conflicts:
casic-server/src/main/java/com/casic/missiles/modular/system/dao/NoiseMapper.java
casic-server/src/main/java/com/casic/missiles/modular/system/service/INoiseService.java
casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/NoiseServiceImpl.java

master

commit f26e04410cab3efb3e16df81774668146e477e6f

2 parents ffa18ab + e209654

casic_zt authored on 24 May 2024

Patch

Unified Split

Showing 12 changed files

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

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

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

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

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

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

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

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

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

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

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

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

Show line notes below