From 84caf250d5638279d45f32af13ddd346bed2e0a4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 06 十二月 2024 18:02:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/vip/Level.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/vip/Level.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/vip/Level.java
index 855de5c..c5d6002 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/vip/Level.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/vip/Level.java
@@ -26,33 +26,38 @@
private String vipDesc;
@ApiModelProperty(value = "消费达到积分 后升级")
- private BigDecimal vipLevelUpShop;
+ private Integer vipLevelUpShop;
@ApiModelProperty(value = "返佣达到积分 后升级")
- private BigDecimal vipLevelUpShare;
+ private Integer vipLevelUpShare;
@ApiModelProperty(value = "升级会员的直推用户人数要求")
private Integer vipDirectNum;
- @ApiModelProperty(value = "升级会员的团队数要求")
+ @ApiModelProperty(value = "升级会员的团队数要求/准代人数")
private Integer vipTeamNum;
@ApiModelProperty(value = "保级：消费x天")
private Integer keepBuyDay;
@ApiModelProperty(value = "保级：消费x分")
- private BigDecimal keepBuyPoint;
+ private Integer keepBuyPoint;
@ApiModelProperty(value = "保级：返佣x天")
private Integer keepShareDay;
@ApiModelProperty(value = "保级：返佣x分")
- private BigDecimal keepSharePoint;
+ private Integer keepSharePoint;
@ApiModelProperty(value = "保级：门店x天")
private Integer keepShopDay;
@ApiModelProperty(value = "保级：门店x分")
- private BigDecimal keepShopPoint;
+ private Integer keepShopPoint;
+
+ @ApiModelProperty(value = "指定购买商品")
+ private List<String> goodsNames;
+
+
--
Gitblit v1.7.1