Merge branch 'usky-zyj' into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/DeviceHttpController.java

@@ -69,7 +69,7 @@ public class DeviceHttpController {
                                                  @RequestParam(value = "domain",required = false) String domain,
                                                  @RequestParam(value = "userId",required = false) Long userId,
                                                  @RequestParam(value = "userName",required = false) String userName,
-                                                 @RequestParam(value = "categoryType") Integer categoryType,
+                                                 @RequestParam(value = "categoryType",required = false , defaultValue = "1") Integer categoryType,
                                                  @RequestParam(value = "gatewayUuid",required = false) String gatewayUuid){
         return ApiResult.success(dmpDeviceInfoService.control(productCode,deviceUuid,commandCode,commandValue,domain,userId,userName,categoryType,gatewayUuid));
     }