From 331c41ca7f21b81985ba23d60ec05c350d21daa8 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期六, 21 十二月 2024 14:59:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4

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

diff --git a/src/main/java/com/mzl/flower/service/impl/CalendarServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/CalendarServiceImpl.java
index 1c564d5..71c5119 100644
--- a/src/main/java/com/mzl/flower/service/impl/CalendarServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/impl/CalendarServiceImpl.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.mzl.flower.mapper.calendar.CalendarMapper;

--
Gitblit v1.9.3