Merge branch 'master' into 20220908

@@ -20,9 +20,6 @@ public class DataBoardDTO extends TenantDTO {
   @ApiModelProperty(value = "视图类型")
   @ApiModelProperty(value = "视图类型")
   private ViewType viewType = ViewType.PRIVATE_VIEW;
   private ViewType viewType = ViewType.PRIVATE_VIEW;
 
 
-  @ApiModelProperty(value = "公有视图URL")
-  private String openUrl;
-
   @ApiModelProperty(value = "组件布局")
   @ApiModelProperty(value = "组件布局")
   private List<ComponentLayoutDTO> layout;
   private List<ComponentLayoutDTO> layout;
 
 

@@ -19,6 +19,15 @@ public class DataSourceInfoDTO implements Serializable {
   @ApiModelProperty(value = "属性", required = true)
   @ApiModelProperty(value = "属性", required = true)
   private String attribute;
   private String attribute;
 
 
+  @ApiModelProperty(value = "设备名称")
+  private String deviceName;
+
+  @ApiModelProperty(value = "是否网关设备")
+  private boolean gatewayDevice = false;
+
+  @ApiModelProperty(value = "子设备ID")
+  private String slaveDeviceId;
+
   @ApiModelProperty(value = "设备重命名")
   @ApiModelProperty(value = "设备重命名")
   private String deviceRename;
   private String deviceRename;
 
 

@@ -22,8 +22,6 @@ public class DataBoard extends TenantBaseEntity {
   @TableField(typeHandler = EnumTypeHandler.class)
   @TableField(typeHandler = EnumTypeHandler.class)
   private ViewType viewType;
   private ViewType viewType;
 
 
-  private String openUrl;
-
   @TableField(typeHandler = JacksonTypeHandler.class)
   @TableField(typeHandler = JacksonTypeHandler.class)
   private JsonNode layout;
   private JsonNode layout;