From c8ea2d96f5b0522a09f3203ae98fe796084d2d15 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 04 一月 2025 09:34:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 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 688cbd4..9e46846 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>
@@ -50,6 +51,10 @@
     @ApiModelProperty(value = "钱包提现权限:1开0关")
     @TableField("vip_withdrawal_role")
     private Integer vipWithdrawalRole;
+
+    @ApiModelProperty(value = "钱包提现权限:1开0关")
+    @TableField("vip_agent_level_up_role")
+    private Integer vipAgentLevelUpRole;
 
     @ApiModelProperty(value = "最低提现门槛")
     @TableField("vip_withdrawal_min_amount")
@@ -135,5 +140,15 @@
     @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