From 95f9ea7eb339c36cade6c67d0385c49ec2d81477 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 14 Apr 2021 19:39:45 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java
index 714b2bf..5fae6d9 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java
@@ -40,6 +40,12 @@
@ApiModelProperty(value = "卡项业绩")
private BigDecimal cardAchieve;
+ @ApiModelProperty(value = "储值卡本金扣款")
+ private BigDecimal cardAmount;
+
+ @ApiModelProperty(value = "储值卡增金扣款")
+ private BigDecimal cardFreeAmount;
+
@ApiModelProperty(value = "退款")
private BigDecimal refund;
@@ -297,4 +303,20 @@
public void setTimeLength(BigDecimal timeLength) {
this.timeLength = timeLength;
}
+
+ public BigDecimal getCardAmount() {
+ return cardAmount;
+ }
+
+ public void setCardAmount(BigDecimal cardAmount) {
+ this.cardAmount = cardAmount;
+ }
+
+ public BigDecimal getCardFreeAmount() {
+ return cardFreeAmount;
+ }
+
+ public void setCardFreeAmount(BigDecimal cardFreeAmount) {
+ this.cardFreeAmount = cardFreeAmount;
+ }
}
--
Gitblit v1.9.1