From cf4e9e9e041545f77f57f7a0c3485d66efe5ce19 Mon Sep 17 00:00:00 2001 From: phpcjl <phpcjl@gmail.com> Date: 星期二, 17 十二月 2024 16:33:34 +0800 Subject: [PATCH] 1 --- ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.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/UserCoupon.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java index 3ca871c..67f81a7 100644 --- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java +++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java @@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.account.api.vo.CouponInfoVo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.time.LocalDate; import java.time.LocalDateTime; /** @@ -48,9 +50,34 @@ @TableField("use_time") private LocalDateTime useTime; + @ApiModelProperty(value = "开始时间") + @TableField("start_time") + private LocalDateTime startTime; + + @ApiModelProperty(value = "结束时间") + @TableField("end_time") + private LocalDateTime endTime; + @ApiModelProperty(value = "优惠劵id") @TableField("coupon_id") private Integer couponId; + @ApiModelProperty(value = "优惠劵信息") + @TableField(exist = false) + private CouponInfoVo couponInfoVo; + + @ApiModelProperty(value = "1未使用2已使用3已过期") + @TableField(exist = false) + private Integer status; + + + @ApiModelProperty(value = "领取用户姓名") + @TableField(exist = false) + private String userName; + + @ApiModelProperty(value = "领取用户手机号") + @TableField(exist = false) + private String phone; + } -- Gitblit v1.7.1