From 74b0e0814e37d640596f44ec86d20fa9ecce9ed6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 二月 2025 10:42:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java
index f46fc43..701a010 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java
@@ -58,7 +58,7 @@
     @TableField("vip_id")
     private Integer vipId;
 
-    @ApiModelProperty(value = "1月卡2季卡3年卡")
+    @ApiModelProperty(value = "1月卡2季卡3年卡4集团")
     @TableField("vip_type")
     private Integer vipType;
 
@@ -88,6 +88,11 @@
     private String couponIds;
     @TableField(exist = false)
     private String vipName;
+    @TableField(exist = false)
+    private Integer type;
+
+    @TableField(exist = false)
+    private TVip vip;
 
 
 

--
Gitblit v1.7.1