Merge branch 'master' into test

device-api/src/main/java/com/xy/dto/MqttDto.java

@@ -168,10 +168,8 @@ public class MqttDto {
 
         @ApiModelProperty("错误日志")
         private String error;
-
-        @ApiModelProperty("执行结果")
-        private String result;
     }
+
     @Data
     @Accessors(chain = true)
     public static class Vo3 extends Vo2 {