From 06e4db5a576c63c10ab4673dba017ffe1a3e7e66 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 17 一月 2025 19:07:27 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 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