Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/sw/patroleditor/domain/vo/RobotMoveCtrlVO.java

@@ -14,11 +14,14 @@ public class RobotMoveCtrlVO {
     @ApiModelProperty(value = "控制方式，1-手动控制，2-定点移动")
     private int mode = 1;
     @ApiModelProperty(value = "x坐标")
+    //  前进x=1，后退x=-1
     private int x;
     @ApiModelProperty(value = "y坐标")
     private int y;
     @ApiModelProperty(value = "z坐标")
+    //  云台高度，下降z=-1，上升z=1
     private int z;
     @ApiModelProperty(value = "移动速度")
+    //  固定1
     private int speed;
 }

src/main/resources/application-dev.properties

@@ -32,8 +32,8 @@ spring.datasource.useGlobalDataSourceStat=true
 
 ############# 配置参数
 robot.id=0
-robot.ip=0
-robot.port=0
+robot.ip=192.168.1.75
+robot.port=9091