From a96c5eddcd63fa6f09e4cdce9e28c7b846068f0c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 18 九月 2024 16:45:51 +0800
Subject: [PATCH] 9.18

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 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 9ca255a..ffc516b 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
@@ -3,12 +3,14 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -37,6 +39,18 @@
     @ApiModelProperty(value = "剩余充电次数")
     @TableField("charge_num")
     private Integer chargeNum;
+    
+    @ApiModelProperty(value = "折扣")
+    @TableField("discount")
+    private BigDecimal discount;
+    
+    @ApiModelProperty(value = "最高优惠金额")
+    @TableField("discount_money")
+    private BigDecimal discountMoney;
+
+    @ApiModelProperty(value = "该会员记录应赠送的充电次数")
+    @TableField("send_charge_num")
+    private Integer sendChargeNum;
 
     @ApiModelProperty(value = "会员id")
     @TableField("vip_id")
@@ -44,14 +58,27 @@
 
     @ApiModelProperty(value = "会员开始时间")
     @TableField("start_time")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDateTime startTime;
 
     @ApiModelProperty(value = "会员结束时间")
     @TableField("end_time")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDateTime endTime;
 
     @TableField("create_time")
     private LocalDateTime createTime;
 
+    @ApiModelProperty(value = "已赠送的月份")
+    @TableField("send_month")
+    private Integer sendMonth;
+
+
+    @ApiModelProperty(value = "要赠送的优惠卷")
+    @TableField("coupon_ids")
+    private String couponIds;
+    @TableField(exist = false)
+    private String vipName;
+
 
 }

--
Gitblit v1.7.1