From 15700b74778de49ba11745ca1dfd7bbf1356ba42 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 27 九月 2024 22:44:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/dto/request/report/QueryOrderDTO.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/request/report/QueryOrderDTO.java b/src/main/java/com/mzl/flower/dto/request/report/QueryOrderDTO.java
index f35960b..e55da06 100644
--- a/src/main/java/com/mzl/flower/dto/request/report/QueryOrderDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/report/QueryOrderDTO.java
@@ -26,4 +26,11 @@
 
     @ApiModelProperty(value = "合伙人id")
     private Long partnerId;
+
+    @ApiModelProperty(value = "下单日期")
+    @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @NotNull(message = "下单日期不能为空")
+    private LocalDate calDate;
+
 }

--
Gitblit v1.9.3