Merge branch 'master' into test

device-api-service/src/main/java/com/xy/service/MqttServiceImpl.java

@@ -125,7 +125,7 @@ public class MqttServiceImpl extends ServiceImpl<MqttCommandMapper, MqttCommand>
                 list.addAll(data);
             }
         });
-        return R.ok(list).setLogMsg(JSONUtil.parseObj(jMap).toString());
+        return R.ok(list).setLogMsg(JSONUtil.parseArray(jMap.getValues()).toString());
     }
 
     @ApiOperation("指令Ack")