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/response/report/OrderReportCalendarBO.java |    4 ++++
 1 files changed, 4 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 f3dceda..a59a58d 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
@@ -17,4 +17,8 @@
     @ApiModelProperty("订单的结束时间")
     private LocalDateTime endDate;
 
+    @ApiModelProperty(value = "合伙人id")
+    private Long partnerId;
+
+
 }

--
Gitblit v1.9.3