From 24e21f8ce1a28a78a58f9a95cc6438b4a9c737a6 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 12 十月 2024 11:09:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java b/src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java
index 6564b6e..0839330 100644
--- a/src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java
@@ -13,7 +13,7 @@
 
     @ApiModelProperty("下单日期")
     @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
-    @DateTimeFormat
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private LocalDateTime orderDate;
 
     @ApiModelProperty("销售额")

--
Gitblit v1.9.3