From 3e95b11cff2e6f59a7d23448f86d3d3bf806e13a Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 06 十二月 2024 18:08:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java | 4 ++--
1 files changed, 2 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..efcb5a7 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")
--
Gitblit v1.7.1