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/bean/SysBeauticianState.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysBeauticianState.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysBeauticianState.java
index d0ae4ac..153ab06 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysBeauticianState.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysBeauticianState.java
@@ -2,7 +2,7 @@
import com.matrix.core.anotations.Extend;
import com.matrix.system.common.bean.SysUsers;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -58,14 +58,14 @@
/**
* 服务开始时间
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
private Date beginTime;
/**
* 服务结束时间
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
private Date endTime;
@@ -92,13 +92,13 @@
* 表单服务开始时间
*/
@Extend
- @DateTimeFormat(pattern = DateUtils.HH_mm)
+ @DateTimeFormat(pattern = DateUtil.HH_mm)
private Date beginTimeForm;
/**
* 服务结束时间
*/
@Extend
- @DateTimeFormat(pattern = DateUtils.HH_mm)
+ @DateTimeFormat(pattern = DateUtil.HH_mm)
private Date endTimeForm;
@@ -114,7 +114,7 @@
@Extend
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_SS)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_SS)
private Date createTime;
/**
--
Gitblit v1.9.1