From 0f4459e4201fdc19185b7dd03215871f036acd70 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 28 五月 2025 16:45:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 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 865d080..b8924ab 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
@@ -79,6 +79,11 @@
     @ApiModelProperty(value = "已赠送的月份")
     @TableField("send_month")
     private Integer sendMonth;
+    /**
+     * 本月会员优惠到期时间
+     */
+    @TableField("month_end_time")
+    private LocalDateTime monthEndTime;
 
     @ApiModelProperty(value = "当时购买的vipJson")
     @TableField("vip_json")
@@ -91,6 +96,9 @@
     @TableField(exist = false)
     private Integer type;
 
+    @TableField(exist = false)
+    private TVip vip;
+
 
 
 }

--
Gitblit v1.7.1