From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0

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