From 5a22de857470ed18e993260e2cf3a38a1a43de7e Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期一, 19 八月 2024 17:13:38 +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 | 20 ++++++++++++++++++++ 1 files changed, 20 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..577fc54 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 @@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.math.BigDecimal; import java.time.LocalDateTime; /** @@ -38,6 +39,16 @@ @TableField("charge_num") private Integer chargeNum; + + + @ApiModelProperty(value = "购买时折扣金额") + @TableField("discount_money") + private BigDecimal discountMoney; + + @ApiModelProperty(value = "该会员记录应赠送的充电次数") + @TableField("send_charge_num") + private Integer sendChargeNum; + @ApiModelProperty(value = "会员id") @TableField("vip_id") private Integer vipId; @@ -53,5 +64,14 @@ @TableField("create_time") private LocalDateTime createTime; + @ApiModelProperty(value = "已赠送的月份") + @TableField("send_month") + private Integer sendMonth; + + + @ApiModelProperty(value = "要赠送的优惠卷") + @TableField("coupon_ids") + private String couponIds; + } -- Gitblit v1.7.1