From d0a4f1260ae71837c125a9f2c4609e6fbf0c5ee1 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 14:36:44 +0800
Subject: [PATCH] 1
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 e1017ef..8093a19 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
@@ -9,7 +9,9 @@
import java.io.Serializable;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -83,12 +85,12 @@
@ApiModelProperty(value = "有效期开始时间")
@TableField("period_start_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime periodStartTime;
@ApiModelProperty(value = "有效期结束时间")
@TableField("period_end_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime periodEndTime;
@ApiModelProperty(value = "领取后x天有效")
@@ -125,14 +127,22 @@
@TableField("shelf_status")
private Integer shelfStatus;
+ @ApiModelProperty(value = "指定会员等级,逗号隔开")
+ private String vipIds;
+
@ApiModelProperty(value = "已发放数量")
@TableField(exist = false)
private Long sendNumNow;
- @ApiModelProperty(value = "指定会员等级,逗号隔开")
- private String vipIds;
+ @ApiModelProperty(value = "其他商品名称")
+ private String goodsNameJson;
- public String getIdStr() {
+
+ @ApiModelProperty(value = "其他商品名称")
+ @TableField(exist = false)
+ private List<String> goodsNameList;
+
+ public String getIdStr(){
return String.valueOf(id);
}
}
--
Gitblit v1.7.1