Merge branch 'master' into 20221201

@@ -39,5 +39,9 @@ public class TkDeviceScriptDTO extends BaseDTO {
   @ApiModelProperty(value = "脚本编数据编码类型:HEX ASCII")
   private TcpDataTypeEnum dataType;
 
+  @ApiModelProperty(value = "保存原始数据：默认false")
+  @NotNull(message = "保存原始数据不能为空",groups = {AddGroup.class})
+  private boolean saveOriginalData;
+
   public TkDeviceScriptDTO() {}
 }

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.BooleanTypeHandler;
 import org.apache.ibatis.type.EnumTypeHandler;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.enums.TcpDataTypeEnum;
@@ -18,7 +19,8 @@ public class TkDeviceScriptEntity extends TenantBaseEntity {
   private Integer status;
 
   private String description;
-
+  @TableField(typeHandler = BooleanTypeHandler.class)
+  private boolean saveOriginalData;
   /** 脚本编数据编码类型 */
   @TableField(typeHandler = EnumTypeHandler.class)
   private TcpDataTypeEnum dataType;