From 1b51c3e64ba8117900d594fcd5b677336e4759bc Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 25 Mar 2021 14:17:38 +0800
Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move

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

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/ServicesFlow.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/ServicesFlow.java
index 5942ca4..cd25ca9 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/ServicesFlow.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/ServicesFlow.java
@@ -3,7 +3,7 @@
 import java.io.Serializable;
 import java.util.Date;
 
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**
@@ -82,12 +82,12 @@
 	/**
 	 * 起始时间
 	 */
-	@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