Merge branch '20220624' into 'upgraded_version'

refactor: 数据源新增高级配置字段

See merge request huang/thingsboard3.3.2!111

@@ -41,4 +41,8 @@ public class ConfigurationDatasourceDTO extends ConfigurationDTO {
 
 
   @ApiModelProperty(value = "组态描述")
   @ApiModelProperty(value = "组态描述")
   private String remark;
   private String remark;
+
+
+  @ApiModelProperty(value = "数据源高级配置说明")
+  private JsonNode additional;
 }
 }

@@ -23,5 +23,7 @@ public class ConfigurationDatasource extends ConfigurationBaseEntity {
     private String deviceId;
     private String deviceId;
     private String slaveDeviceId;
     private String slaveDeviceId;
     private String attr;
     private String attr;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JsonNode additional;
 
 
 }
 }