代码冲突

src/main/java/com/iflytop/sgs/app/service/device/module/SolutionModuleService.java

@@ -118,14 +118,7 @@ public class SolutionModuleService {
         CommandFuture deviceCommandFuture = deviceCommandService.sendCommand(cmdId, cmdCode, deviceCommand);
         CommandUtil.wait(deviceCommandFuture);
     }
-    /**
-     * 加液机械臂移动到0
-     */
-    public void solutionMotorMoveZero(String cmdId, String cmdCode) throws Exception {
-        DeviceCommandBundle deviceCommand = DeviceCommandGenerator.solutionMotorMove(0.0);
-        CommandFuture deviceCommandFuture = deviceCommandService.sendCommand(cmdId, cmdCode, deviceCommand);
-        CommandUtil.wait(deviceCommandFuture);
-    }
+
     /**
      * 加液泵加液
      */