From 021fcaca65cc87874e216630153e17455acaabce Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 12 十月 2024 16:41:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/dto/request/report/QueryPartnerOrderDTO.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/report/QueryPartnerOrderDTO.java b/src/main/java/com/mzl/flower/dto/request/report/QueryPartnerOrderDTO.java
index 4dd1de4..79540e4 100644
--- a/src/main/java/com/mzl/flower/dto/request/report/QueryPartnerOrderDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/report/QueryPartnerOrderDTO.java
@@ -27,4 +27,15 @@
@NotNull(message = "结束日期不能为空")
private LocalDate paymentDateEnd;
+
+ @ApiModelProperty(value = "开始时间",hidden = true)
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime startDate;
+
+ @ApiModelProperty(value = "结束时间",hidden = true)
+ @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