From dd6cab3f295e2e9f127313c1ea3dde09eccb2ce6 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 11 Jun 2021 21:57:50 +0800 Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop --- zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java | 14 ++++++++++++++ 1 files changed, 14 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 c6ae234..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 @@ -439,10 +439,24 @@ 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; } -- Gitblit v1.9.1