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-web/src/main/resources/config/application.yml dev
commit 81c1d37ac83a931a08ce6ba298267534389ef5e1 2 parents 4b9bed6 + 94f61f8 casic_zt authored on 3 Sep

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/AppNavStopMsgHandler.java 0 → 100644

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/opt/impl/RobotOptServiceImpl.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/dto/ResultNavStopDTO.java 0 → 100644

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

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

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

Show line notes below