From 95cdd1c5f86bf7ec5af17a07d819976a0365b5d7 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 09 Dec 2020 09:54:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java
index b768fbb..fee903f 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.matrix.core.anotations.Extend;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -233,14 +233,14 @@
 	/**
 	 * 开始时间
 	 */
-	@DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+	@DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
 	private Date  beginTime;
 			
 	
 	/**
 	 * 结束时间
 	 */
-	@DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+	@DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
 	private Date  endTime;
 
 

--
Gitblit v1.9.1