From be98bd60f3332f4960d8a5a27778e2d6c2cdcb7f Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 25 Jan 2021 15:39:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/app/vo/VipAchieveDataShowVo.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/VipAchieveDataShowVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/VipAchieveDataShowVo.java
index d392636..a6a05e7 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/VipAchieveDataShowVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/VipAchieveDataShowVo.java
@@ -21,10 +21,10 @@
@ApiModelProperty(value = "现金业绩")
private BigDecimal cashAmount;
- @ApiModelProperty(value = "售卡业绩")
+ @ApiModelProperty(hidden = true)
private BigDecimal cardAmount;
- @ApiModelProperty(value = "产品业绩")
+ @ApiModelProperty(value = "订单提成")
private BigDecimal goodsAmount;
@ApiModelProperty(value = "划扣业绩")
@@ -36,7 +36,7 @@
@ApiModelProperty(value = "赠送消耗")
private BigDecimal freeConsume;
- @ApiModelProperty(value = "提成")
+ @ApiModelProperty(value = "服务提成")
private BigDecimal commission;
@ApiModelProperty(value = "人头数")
--
Gitblit v1.9.1