From ae40432d02f5a698994c0b0847ef1b3f3f31451b Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期二, 08 十月 2024 17:13:27 +0800
Subject: [PATCH] Merge branch 'master-v3' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v3

---
 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..a6fb34e 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