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-dev.yml dev
commit 4ed518119232d6a0a20d1a98a5e693856d669fe6 2 parents 94d6c64 + cd441a9 casic_zt authored on 21 Mar 2024

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View casic-ptz/src/main/java/com/casic/missiles/modular/ptz/common/DeviceCommon.java

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

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java

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-web/src/main/build/bin/start.bat

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

Show line notes below