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

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

@@ -96,6 +96,9 @@ public class DeviceInfoDto {
         @ApiModelProperty(value = "管理员名称")
         private String adminName;
 
+        @ApiModelProperty(value = "adminId 对应权限用户表ID")
+        private String adminId;
+
         @ApiModelProperty(value = "设备数")
         private Integer deviceNum;
 
@@ -109,12 +112,17 @@ public class DeviceInfoDto {
         @ApiModelProperty("设备ID")
         private Long deviceId;
 
+
         @ApiModelProperty("设备名称")
         private String deviceName;
 
         @ApiModelProperty("管理员姓名")
         private String adminName;
 
+
+        @ApiModelProperty("管理员ID")
+        private String adminId;
+
         @ApiModelProperty("设备类型")
         private Integer deviceType;
 
@@ -134,6 +142,7 @@ public class DeviceInfoDto {
         private String mercCode;
     }
 
+
     @Data
     @Accessors(chain = true)
     public static class TyDeviceDTO {