From ba4cecf87e80fb01aeb69377b7e978399c4d60e6 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期二, 14 一月 2025 12:09:38 +0800 Subject: [PATCH] 12.18 --- ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java index 8093a19..a31866e 100644 --- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java +++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.account.api.model.AppUser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -35,7 +36,6 @@ @ApiModelProperty(value = "删除标志(0=否,1=是)") @TableField("del_flag") - @TableLogic private Integer delFlag; @ApiModelProperty(value = "添加时间") @@ -86,12 +86,12 @@ @ApiModelProperty(value = "有效期开始时间") @TableField("period_start_time") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime periodStartTime; + private LocalDate periodStartTime; @ApiModelProperty(value = "有效期结束时间") @TableField("period_end_time") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime periodEndTime; + private LocalDate periodEndTime; @ApiModelProperty(value = "领取后x天有效") @TableField("period_days") @@ -142,6 +142,16 @@ @TableField(exist = false) private List<String> goodsNameList; + @TableField(exist = false) + private List<Goods> goods; + + @TableField(exist = false) + private List<AppUser> appUserList; + + @TableField(exist = false) + private String phone; + + public String getIdStr(){ return String.valueOf(id); } -- Gitblit v1.7.1