From 7cbb9f42f6f9430aae846ae25b7ad77a82528927 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 14:31:04 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java | 8 ++++++--
1 files changed, 6 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..688cbd4 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
@@ -65,7 +65,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 +73,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 +131,9 @@
@TableField("keep_shop_point")
private Integer keepShopPoint;
+ @ApiModelProperty(value = "会员等级是否必须达到代理： 0-否 1-是")
+ @TableField("vip_level_up_proxy_role")
+ private Integer vipLevelUpProxyRole;
+
}
--
Gitblit v1.7.1