From 79f4e0526fe89825cfa6b84230d850b3147b5a7b Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 28 十月 2024 18:46:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4

---
 src/main/java/com/mzl/flower/service/calendar/CalendarService.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/service/calendar/CalendarService.java b/src/main/java/com/mzl/flower/service/calendar/CalendarService.java
index b3e0cf2..6d2f1a1 100644
--- a/src/main/java/com/mzl/flower/service/calendar/CalendarService.java
+++ b/src/main/java/com/mzl/flower/service/calendar/CalendarService.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.mzl.flower.dto.request.report.QueryOrderDTO;
+import com.mzl.flower.dto.request.report.QueryPartnerOrderDTO;
 import com.mzl.flower.dto.response.report.OrderReportCalendarBO;
 import com.mzl.flower.entity.CalendarDO;
 import com.baomidou.mybatisplus.extension.service.IService;

--
Gitblit v1.9.3