From d390d8f502436eaa17ee8ca7abd3c3f8a11a8514 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 12 十月 2024 13:43:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/service/report/OrderReportService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 c30c944..221239d 100644
--- a/src/main/java/com/mzl/flower/service/report/OrderReportService.java
+++ b/src/main/java/com/mzl/flower/service/report/OrderReportService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mzl.flower.dto.request.report.QueryOrderDTO;
import com.mzl.flower.dto.request.report.QuerySupplierDTO;
+import com.mzl.flower.dto.request.report.QueryPartnerOrderDTO;
import com.mzl.flower.dto.response.report.OrderDetailReportResultVO;
import com.mzl.flower.dto.response.report.OrderPartnerReportResultVO;
import com.mzl.flower.dto.response.report.OrderReportResultVO;
@@ -28,7 +29,7 @@
* @param dto
* @return
*/
- Page<OrderPartnerReportResultVO> getPartnerSalePage(Page page, QueryOrderDTO dto);
+ Page<OrderPartnerReportResultVO> getPartnerSalePage(Page page, QueryPartnerOrderDTO dto);
/**
* 合伙人结算列表统计
@@ -36,9 +37,9 @@
* @param dto
* @return
*/
- OrderPartnerReportResultVO getPartnerSaleStatis(QueryOrderDTO dto);
+ OrderPartnerReportResultVO getPartnerSaleStatis(QueryPartnerOrderDTO dto);
- void exportPartnerSalesList(HttpServletResponse response, QueryOrderDTO dto);
+ void exportPartnerSalesList(HttpServletResponse response, QueryPartnerOrderDTO dto);
Page<OrderSupplierReportResultVO> getOrderSupplierPage(Page page, QuerySupplierDTO dto);
--
Gitblit v1.9.3