From 1b51c3e64ba8117900d594fcd5b677336e4759bc Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 25 Mar 2021 14:17:38 +0800
Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move

---
 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