From a8d2cb07f6440dc54dc4005b0b06d5a47cb1517d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 16 十二月 2024 13:34:03 +0800
Subject: [PATCH] 12.16

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java
index 3640be0..799df1d 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java
@@ -10,6 +10,7 @@
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * <p>
@@ -65,7 +66,7 @@
 
     @ApiModelProperty(value = "达成会员等级所需消费积分数量")
     @TableField("vip_level_up_shop")
-    private BigDecimal vipLevelUpShop;
+    private Integer vipLevelUpShop;
 
     @ApiModelProperty(value = "通过消费积分达成会员等级的开关 1开0关")
     @TableField("vip_level_up_shop_role")
@@ -73,7 +74,7 @@
 
     @ApiModelProperty(value = "达成会员等级所需的返佣积分数量")
     @TableField("vip_level_up_share")
-    private BigDecimal vipLevelUpShare;
+    private Integer vipLevelUpShare;
 
     @ApiModelProperty(value = "通过返佣积分达成会员等级的开关 1开0关")
     @TableField("vip_level_up_share_role")
@@ -131,5 +132,18 @@
     @TableField("keep_shop_point")
     private Integer keepShopPoint;
 
+    @ApiModelProperty(value = "会员等级是否必须达到代理: 0-否 1-是")
+    @TableField("vip_level_up_proxy_role")
+    private Integer vipLevelUpProxyRole;
+
+    @ApiModelProperty(value = "指定会员升级商品")
+    @TableField("good_ids")
+    private String goodIds;
+
+
+    @ApiModelProperty("指定商品列表")
+    @TableField(exist = false)
+    private List<Goods> goodsList;
+
 
 }

--
Gitblit v1.7.1