From 58a8acceb63d52377da4b837e859f2e03d2bce1b Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期一, 14 十月 2024 08:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v3' into master-v2
---
src/main/java/com/mzl/flower/service/report/OrderReportService.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/report/OrderReportService.java b/src/main/java/com/mzl/flower/service/report/OrderReportService.java
index 67feee8..221239d 100644
--- a/src/main/java/com/mzl/flower/service/report/OrderReportService.java
+++ b/src/main/java/com/mzl/flower/service/report/OrderReportService.java
@@ -40,7 +40,6 @@
OrderPartnerReportResultVO getPartnerSaleStatis(QueryPartnerOrderDTO dto);
void exportPartnerSalesList(HttpServletResponse response, QueryPartnerOrderDTO dto);
- void exportPartnerSalesList(HttpServletResponse response, QueryOrderDTO dto);
Page<OrderSupplierReportResultVO> getOrderSupplierPage(Page page, QuerySupplierDTO dto);
--
Gitblit v1.9.3