From c26b5587a09499797b65f353db7775a6db150ed2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 16 十二月 2024 14:13:43 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java |    6 +++---
 1 files changed, 3 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 116fca0..c6ccb84 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
@@ -86,12 +86,12 @@
     @ApiModelProperty(value = "有效期开始时间")
     @TableField("period_start_time")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate periodStartTime;
+    private LocalDateTime periodStartTime;
 
     @ApiModelProperty(value = "有效期结束时间")
     @TableField("period_end_time")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate periodEndTime;
+    private LocalDateTime periodEndTime;
 
     @ApiModelProperty(value = "领取后x天有效")
     @TableField("period_days")
@@ -135,7 +135,7 @@
     private Long sendNumNow;
 
     @ApiModelProperty(value = "其他商品名称")
-    private String goodsNames;
+    private String goodsNameJson;
 
 
     @ApiModelProperty(value = "其他商品名称")

--
Gitblit v1.7.1