Merge branch '设备查询通用组件' into test

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

@@ -62,7 +62,7 @@ public class DeviceInfoDto {
         @ApiModelProperty(value = "设备名称")
         private String deviceName;
 
-        @ApiModelProperty(value = "权限设备id多个", hidden = true)
+        @ApiModelProperty(value = "设备id")
         private Long deviceId;
     }