From f38160a365599318dae24eb2b9f07de8b78f7e1e Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 11 十月 2024 08:41:04 +0800
Subject: [PATCH] Merge branch 'master-v2' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v2

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

diff --git a/src/main/java/com/mzl/flower/dto/response/report/OrderReportCalendarBO.java b/src/main/java/com/mzl/flower/dto/response/report/OrderReportCalendarBO.java
index 9866d52..8b722d1 100644
--- a/src/main/java/com/mzl/flower/dto/response/report/OrderReportCalendarBO.java
+++ b/src/main/java/com/mzl/flower/dto/response/report/OrderReportCalendarBO.java
@@ -3,6 +3,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data
@@ -24,4 +25,11 @@
     private Integer partnerFlag;
 
 
+    @ApiModelProperty("订单的开始日期")
+    private LocalDate paymentDateStart;
+
+    @ApiModelProperty("订单的结束日期")
+    private LocalDate paymentDateEnd;
+
+
 }

--
Gitblit v1.9.3