From f28142767f8823667499e6e94a76789f601f1654 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 16 十二月 2024 13:34:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java | 11 +++++++++--
1 files changed, 9 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 0579937..5b352f5 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
@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -8,6 +9,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -37,6 +39,7 @@
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty(value = "优惠券名称")
@@ -81,11 +84,13 @@
@ApiModelProperty(value = "有效期开始时间")
@TableField("period_start_time")
- private LocalDateTime periodStartTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate periodStartTime;
@ApiModelProperty(value = "有效期结束时间")
@TableField("period_end_time")
- private LocalDateTime periodEndTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate periodEndTime;
@ApiModelProperty(value = "领取后x天有效")
@TableField("period_days")
@@ -93,10 +98,12 @@
@ApiModelProperty(value = "开始发放时间")
@TableField("send_start_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime sendStartTime;
@ApiModelProperty(value = "结束发放时间")
@TableField("send_end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime sendEndTime;
@ApiModelProperty(value = "1免费发放2积分兑换")
--
Gitblit v1.7.1