Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/casic-robot-inspection into dev

Fork: 0

codedev / casic-robot-inspection

Browse code Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/casic-robot-inspection into dev Conflicts: casic-server/src/main/java/com/casic/missiles/modular/constants/RobotDictConstants.java dev
commit a6dde277adb8ef2762fb11c63c8c4daca83f039a 2 parents c9ce824 + 3a6ac47 liwenhao authored on 31 Jan 2024

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/constants/RobotDictConstants.java

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

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java 0 → 100644

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/neutron/model/DetectorConfig.java

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

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

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

Ignore Space Show notes View casic-web/src/main/resources/config/application-dev.yml

Show line notes below