diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java index 4d0fc813dc..6846564901 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInAddEditFormDTO.java @@ -86,7 +86,7 @@ public class IcMoveInAddEditFormDTO implements Serializable { * 迁入时间 */ @NotNull(message = "迁入时间不能为空", groups = {AddGroup.class}) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date inTime; /** * 迁入原因 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java index d5488a34f9..b3ee1398bd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java @@ -51,7 +51,7 @@ public class IcMoveInRecordExcel { @ExcelProperty(value = "迁入时间") @ColumnWidth(20) @Excel(name = "迁入时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date inTime; @ExcelProperty(value = "迁入原因")