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/InstoreInfoController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/InstoreInfoController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/InstoreInfoController.java
index 1a29ec5..d4ee29d 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/InstoreInfoController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/InstoreInfoController.java
@@ -19,7 +19,7 @@
import com.matrix.system.hive.bean.SysInstoreDetail;
import com.matrix.system.hive.bean.SysInstoreInfo;
import com.matrix.system.hive.dao.SysInstoreDetailDao;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.plugin.util.MoneyUtil;
import com.matrix.system.hive.service.CodeService;
import com.matrix.system.hive.service.SysInstoreInfoService;
@@ -290,7 +290,7 @@
for (SysInstoreInfo item : dataList) {
List<Object> temp = new ArrayList<>();
temp.add(item.getInstoreId());
- temp.add(DateUtils.dateToString(item.getInstoreDate(), DateUtils.DATE_FORMAT_MM));
+ temp.add(DateUtil.dateToString(item.getInstoreDate(), DateUtil.DATE_FORMAT_MM));
temp.add(item.getSumall());
temp.add(item.getMakingmanName());
temp.add(item.getAppmanName());
--
Gitblit v1.9.1