diff --git a/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java b/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java index a8236c8e..96390e31 100644 --- a/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java +++ b/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java @@ -53,8 +53,8 @@ public class RohsEntity implements Serializable { /** * 计划转量产时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date plannedMassProductionDate; /** @@ -115,9 +115,7 @@ public class RohsEntity implements Serializable { /** * 材料有效期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date materialValidityTime; + private String materialValidityTime; /** * 材料有效期备注 @@ -155,9 +153,11 @@ public class RohsEntity implements Serializable { private String buyer; /** - * 预计提供报告时间(个月内) + * 预计提供报告时间(一个月内) */ - private Integer expectReportTime; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date expectReportTime; /** * 所需审批文件