From 8c6ed6820e53c27fa40973da285fd39a66424540 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 07 五月 2025 14:03:08 +0800
Subject: [PATCH] 提交等保部分功能修改
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java | 12 +++++++++++-
1 files changed, 11 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 6dc0a57..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
@@ -69,7 +69,7 @@
@ApiModelProperty(value = "会员结束时间")
@TableField("end_time")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime endTime;
@TableField("create_time")
@@ -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")
@@ -88,6 +93,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