From b9903ead016b8b1aa68eb04b48fca3b53fdab0d3 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 30 十二月 2024 10:42:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/dto/request/sms/SmsTemplateQueryDTO.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/sms/SmsTemplateQueryDTO.java b/src/main/java/com/mzl/flower/dto/request/sms/SmsTemplateQueryDTO.java
index 545bd0d..f56325c 100644
--- a/src/main/java/com/mzl/flower/dto/request/sms/SmsTemplateQueryDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/sms/SmsTemplateQueryDTO.java
@@ -1,10 +1,11 @@
package com.mzl.flower.dto.request.sms;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
-import java.util.Date;
@Data
public class SmsTemplateQueryDTO {
@@ -21,8 +22,12 @@
private String description;
@ApiModelProperty(value = "开始时间")
- private Date startDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime startDate;
@ApiModelProperty(value = "结束时间")
- private Date endDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime endDate;
}
--
Gitblit v1.9.3