From 1d8b7df974e1fbdacff7632b05bdc30d78a6a8c1 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 25 Oct 2021 13:30:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
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