From a9f950c0d11a687a7a940443b8c765f6d87ae4f1 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:26:22 +0800
Subject: [PATCH] 合并新的修改
---
zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java
index eb15819..2c08183 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java
@@ -79,6 +79,8 @@
* 购买业绩
*/
private Double goodsCash;
+
+ private Double cardCash;
/**
* 赠送消耗
@@ -245,6 +247,24 @@
private String payMethod;
+ private String cateName;
+
+ public Double getCardCash() {
+ return cardCash;
+ }
+
+ public void setCardCash(Double cardCash) {
+ this.cardCash = cardCash;
+ }
+
+ public String getCateName() {
+ return cateName;
+ }
+
+ public void setCateName(String cateName) {
+ this.cateName = cateName;
+ }
+
public String getPayMethod() {
return payMethod;
}
--
Gitblit v1.9.1