From 128532d205e5a8985690c642bd49ee3a6921a57a Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 13 十二月 2024 10:28:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java | 10 ++++++++++
1 files changed, 10 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..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>
@@ -135,5 +136,14 @@
@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