From 63f4c14d15e6656bfd1833f3eb3804d00c4af051 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 15 Apr 2021 17:41:17 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

---
 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