From 9a1173507d06c59a7c02e92ad083073e0036eadc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 26 九月 2024 18:52:35 +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 |    8 +++++++-
 1 files changed, 7 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 ffc516b..046b4b8 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
@@ -56,6 +56,10 @@
     @TableField("vip_id")
     private Integer vipId;
 
+    @ApiModelProperty(value = "1月卡2季卡3年卡")
+    @TableField("vip_type")
+    private Integer vipType;
+
     @ApiModelProperty(value = "会员开始时间")
     @TableField("start_time")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@@ -73,7 +77,9 @@
     @TableField("send_month")
     private Integer sendMonth;
 
-
+    @ApiModelProperty(value = "当时购买的vipJson")
+    @TableField("vip_json")
+    private String vipJson;
     @ApiModelProperty(value = "要赠送的优惠卷")
     @TableField("coupon_ids")
     private String couponIds;

--
Gitblit v1.7.1