From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0

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

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysWorktime.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysWorktime.java
index 10defea..7b3b44c 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysWorktime.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysWorktime.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;
 
 /**
@@ -26,10 +26,10 @@
 	private String name;
 	
 
-	@DateTimeFormat(pattern = DateUtils.HH_mm)
+	@DateTimeFormat(pattern = DateUtil.HH_mm)
 	private Date  startTime;
 	
-	@DateTimeFormat(pattern = DateUtils.HH_mm)
+	@DateTimeFormat(pattern = DateUtil.HH_mm)
 	private Date  endTime;
 
 	

--
Gitblit v1.9.1