diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostTodo.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostTodo.java index b494d761..275543de 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostTodo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostTodo.java @@ -36,7 +36,6 @@ public class TbsCostTodo implements Serializable { private Long costApplyId; /** 涉及品牌 */ - @NotBlank(message = "涉及品牌不能为空") @Length(max = 255,message = "涉及品牌长度不能超过255字") private String brands; @@ -52,11 +51,14 @@ public class TbsCostTodo implements Serializable { @NotNull(message = "完成状态不能为空") private Integer finishedFlag; - /** 备注 */ + /** 交付标准 */ @Length(max = 255,message = "备注长度不能超过255字") - private String remark; + private String payMsg; - private String tenantId; + /** 预付款时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private LocalDate prePayDate; /** 创建时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -64,6 +66,13 @@ public class TbsCostTodo implements Serializable { @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; + /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") + private String remark; + + private String tenantId; + + /** 创建人 */ @TableField(fill = FieldFill.INSERT) private String createBy; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostTodoBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostTodoBo.java index a0d43a61..0cb4b5ab 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostTodoBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostTodoBo.java @@ -5,6 +5,8 @@ import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; @@ -38,7 +40,6 @@ public class TbsCostTodoBo implements Serializable { private String brands; /** 描述 */ - @NotBlank(message = "描述不能为空") @Length(max = 255,message = "描述长度不能超过255字") private String descr; @@ -53,5 +54,15 @@ public class TbsCostTodoBo implements Serializable { @Length(max = 255,message = "备注长度不能超过255字") private String remark; + /** 交付标准 */ + @Length(max = 255,message = "备注长度不能超过255字") + private String payMsg; + + /** 预付款时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @TableField(fill = FieldFill.INSERT) + private LocalDate prePayDate; + }