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/app/vo/UserAchieveVo.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/UserAchieveVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/UserAchieveVo.java
index 0c98178..216c609 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/UserAchieveVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/UserAchieveVo.java
@@ -15,13 +15,13 @@
     @ApiModelProperty(value = "用户ID")
     private Long id;
 
-    @ApiModelProperty(value = "订单业绩")
+    @ApiModelProperty(value = "现金业绩")
     private BigDecimal orderCash;
 
-    @ApiModelProperty(value = "现金业绩")
+    @ApiModelProperty(value = "划扣业绩")
     private BigDecimal cash;
 
-    @ApiModelProperty(value = "划扣业绩")
+    @ApiModelProperty(value = "业绩提成")
     private BigDecimal cardUse;
 
     @ApiModelProperty(value = "本金消耗")

--
Gitblit v1.9.1