From ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Wed, 09 Jun 2021 20:44:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

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

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/Onlinebooking.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/Onlinebooking.java
index 9d3505a..5f72d3b 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/Onlinebooking.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/Onlinebooking.java
@@ -4,7 +4,7 @@
 import com.matrix.system.common.bean.EntityDTOExt;
 import com.matrix.system.common.bean.SysUsers;
 import com.matrix.system.constance.Dictionary;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
 import com.matrix.system.shopXcx.bean.ShopProduct;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -44,7 +44,7 @@
     /**
      * 预约时间
      */
-    @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_ST)
+    @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_ST)
     private Date time;
     /**
      * 客户备注

--
Gitblit v1.9.1