From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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..7598c4c 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;
@@ -86,12 +87,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 +143,13 @@
@TableField(exist = false)
private List<String> goodsNameList;
+ @TableField(exist = false)
+ private List<Goods> goods;
+
+ @TableField(exist = false)
+ private List<AppUser> appUserList;
+
+
public String getIdStr(){
return String.valueOf(id);
}
--
Gitblit v1.7.1