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/action/OnlinebookingController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/OnlinebookingController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/OnlinebookingController.java
index 1b02b51..a928e8f 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/OnlinebookingController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/OnlinebookingController.java
@@ -12,7 +12,7 @@
import com.matrix.system.hive.bean.SysShopInfo;
import com.matrix.system.hive.dao.OnlinebookingDao;
import com.matrix.system.hive.dao.SysShopInfoDao;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.plugin.util.ExcelUtil;
import com.matrix.system.hive.service.OnlinebookingService;
import com.matrix.system.shopXcx.bean.ShopProduct;
@@ -135,14 +135,14 @@
for(Onlinebooking obj:dataList){
List<Object> temp = new ArrayList<>();
temp.add(obj.getVipInfo().getVipName());
- String strDate= DateUtils.dateToString(obj.getTime(), DateUtils.DATE_FORMAT_SS);
+ String strDate= DateUtil.dateToString(obj.getTime(), DateUtil.DATE_FORMAT_SS);
temp.add(strDate);
temp.add(obj.getStatus());
//时间转为字符串
temp.add(obj.getReason());
temp.add(obj.getRemark());
temp.add(obj.getShopName());
- String crtDate=DateUtils.dateToString(obj.getCreateTime(), DateUtils.DATE_FORMAT_SS);
+ String crtDate=DateUtil.dateToString(obj.getCreateTime(), DateUtil.DATE_FORMAT_SS);
temp.add(crtDate);
list.add(temp);
}
--
Gitblit v1.9.1