From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1.	新增套餐中有效和无效的操作 2.	会员修改门店功能 3.	套餐新增编辑次数功能 4.	计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5.	打印小票功能调整间距，和收银人 6.	PC端服务单新增划扣金额展示

---
 zq-erp/src/main/java/com/matrix/system/hive/action/CheckInfoDetailController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/CheckInfoDetailController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/CheckInfoDetailController.java
index 00e9dfb..8211e02 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/CheckInfoDetailController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/CheckInfoDetailController.java
@@ -11,9 +11,10 @@
 
 import com.matrix.core.pojo.AjaxResult;
 import com.matrix.core.pojo.PaginationVO;
+
+import com.matrix.core.tools.DateUtil;
 import com.matrix.system.hive.bean.SysCheckDetail;
 import com.matrix.system.hive.bean.SysCheckInfo;
-import com.matrix.system.hive.plugin.util.DateUtils;
 import com.matrix.system.hive.plugin.util.ExcelUtil;
 import com.matrix.system.hive.service.CodeService;
 import com.matrix.system.hive.service.SysCheckDetailService;
@@ -102,7 +103,7 @@
 		temp1.add(checkInfo.getCheckType());
 		temp1.add(checkInfo.getCheckNo());
 		// 时间转为字符串
-		String strDate = DateUtils.dateToString(checkInfo.getCheckDate(), DateUtils.DATE_FORMAT_DD);
+		String strDate = DateUtil.dateToString(checkInfo.getCheckDate(), DateUtil.DATE_FORMAT_DD);
 		temp1.add(strDate);
 		temp1.add(checkInfo.getMakingManName());
 		temp1.add(checkInfo.getAppManName());

--
Gitblit v1.9.1