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/statistics/BusinessDataShowVo.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/statistics/BusinessDataShowVo.java b/zq-erp/src/main/java/com/matrix/system/hive/statistics/BusinessDataShowVo.java
index 71ca931..ce572a6 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/statistics/BusinessDataShowVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/statistics/BusinessDataShowVo.java
@@ -1,7 +1,7 @@
package com.matrix.system.hive.statistics;
import com.matrix.core.anotations.Extend;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -26,12 +26,12 @@
* 查询条件
*/
@Extend
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_DD)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_DD)
private Date beginTime;
@Extend
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_DD)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_DD)
private Date endTime;
public Date getBeginTime() {
--
Gitblit v1.9.1