From 75f1c8f7380994e032de7d32ca7890dff543aaa2 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 21 Jul 2021 10:19:15 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java
index c6ae234..789b879 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java
@@ -210,7 +210,7 @@
/**
* 单会员是否只买一次
*/
- private String isOnce;
+ private Integer isOnce;
/**
* 销售平台
@@ -439,9 +439,23 @@
private Long achieveRuleId;
/**
+ *业绩规则名称
+ */
+ @Extend
+ private String achieveRuleName;
+
+ /**
* 支付方式 1-充值本金 2-赠送金额 3-积分
*/
private String payMethods;
+
+ public String getAchieveRuleName() {
+ return achieveRuleName;
+ }
+
+ public void setAchieveRuleName(String achieveRuleName) {
+ this.achieveRuleName = achieveRuleName;
+ }
public Long getAchieveRuleId() {
return achieveRuleId;
@@ -988,11 +1002,12 @@
this.saleOffTime = saleOffTime;
}
- public String getIsOnce() {
+
+ public Integer getIsOnce() {
return isOnce;
}
- public void setIsOnce(String isOnce) {
+ public void setIsOnce(Integer isOnce) {
this.isOnce = isOnce;
}
--
Gitblit v1.9.1