From 693f6204a6db2b4b1b80b562fcc1dccc09bb26e7 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 19 Jun 2021 14:45:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 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 7dfeeff..9824694 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
@@ -433,12 +433,38 @@
* 任选套餐是否无限次 N-否 Y-是
*/
private String isInfinite;
+ /**
+ *业绩规则id
+ */
+ 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;
+ }
+
+ public void setAchieveRuleId(Long achieveRuleId) {
+ this.achieveRuleId = achieveRuleId;
+ }
+
public String getPayMethods() {
return payMethods;
}
--
Gitblit v1.9.1