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/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