From 2e7d9e3e849bda0dae16c1f0c9623df7113b9d0b Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 02 Dec 2020 00:04:08 +0800
Subject: [PATCH] 数据分析人头1

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/SysInstoreInfo.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysInstoreInfo.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysInstoreInfo.java
index 25a4de4..5974dbb 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysInstoreInfo.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysInstoreInfo.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.matrix.core.pojo.EntityDTO;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -28,7 +28,7 @@
 	/**
 	 * 入库日期
 	 */
-	@DateTimeFormat(pattern= DateUtils.DATE_FORMAT_MM)
+	@DateTimeFormat(pattern= DateUtil.DATE_FORMAT_MM)
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
 	private Date  instoreDate;
 			
@@ -126,13 +126,13 @@
 	 * 开始时间
 	 */
 	
-	@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;
 
 	private Long shopId;

--
Gitblit v1.9.1