From fa4cd10b8bb96e09db96558c3648071c78a6e72d Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Sun, 15 May 2022 23:05:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ktg/mes/pro/domain/ProTask.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProTask.java b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProTask.java index 7c258c7..1e74ee4 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProTask.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProTask.java @@ -114,8 +114,8 @@ public class ProTask extends BaseEntity private String clientNick; /** 开始生产时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开始生产时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "开始生产时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date startTime; /** 生产时长 */ @@ -123,8 +123,8 @@ public class ProTask extends BaseEntity private Long duration; /** 完成生产时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "完成生产时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "完成生产时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date endTime; /** 甘特图显示颜色 */ @@ -132,7 +132,7 @@ public class ProTask extends BaseEntity private String colorCode; /** 需求日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") @Excel(name = "需求日期", width = 30, dateFormat = "yyyy-MM-dd") private Date requestDate;