From 6924e965ea3da70823f50f7285b50efab7205415 Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Sat, 08 May 2021 22:42:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger --- zq-erp/src/main/java/com/matrix/system/hive/pojo/AllotedAndInstored.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/pojo/AllotedAndInstored.java b/zq-erp/src/main/java/com/matrix/system/hive/pojo/AllotedAndInstored.java index 6d733d1..53ffa0f 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/pojo/AllotedAndInstored.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/pojo/AllotedAndInstored.java @@ -2,7 +2,7 @@ import java.util.Date; -import com.matrix.system.hive.plugin.util.DateUtils; +import com.matrix.core.tools.DateUtil; import org.springframework.format.annotation.DateTimeFormat; @@ -52,12 +52,12 @@ /** * 开始时间 */ - @DateTimeFormat(pattern= DateUtils.DATE_FORMAT_MM) + @DateTimeFormat(pattern= DateUtil.DATE_FORMAT_MM) private Date startTime; /** * 结束时间 */ - @DateTimeFormat(pattern=DateUtils.DATE_FORMAT_MM) + @DateTimeFormat(pattern=DateUtil.DATE_FORMAT_MM) private Date endTime; -- Gitblit v1.9.1