后台代码处理

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/strategy/impl/ToolRobotStrategy.java

@@ -258,12 +258,8 @@ public class ToolRobotStrategy implements RobotStrategy {
             }
         }
 
-<<<<<<< Updated upstream
         //todo 与ccs联调需要释放  $需要换地址$
         bool = this.cutToolActionCondition("/api/getCutterDeviceIsPut", taskNode,pointId);
-=======
-        //bool = this.cutToolActionCondition("/api/getCutterDeviceIsPut", taskNode,pointId);
->>>>>>> Stashed changes
 
         if(!bool){
             msgUtil.createWarnLog("刀具节点目标位放置条件不满足","DataException");