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/web/partner/OrderPartnerController.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/web/partner/OrderPartnerController.java b/src/main/java/com/mzl/flower/web/partner/OrderPartnerController.java
index d5906c5..c13eb7d 100644
--- a/src/main/java/com/mzl/flower/web/partner/OrderPartnerController.java
+++ b/src/main/java/com/mzl/flower/web/partner/OrderPartnerController.java
@@ -19,6 +19,7 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 @RestController
@@ -85,4 +86,10 @@
         dto.setPartnerId(partner.getId());
         return returnData(R.SUCCESS.getCode(), orderService.selectOrderCheckLocationList(dto));
     }
+
+    @GetMapping("/list/export")
+    @ApiOperation(value = "合伙人订单导出")
+    public void exportPartnerOrderList(HttpServletResponse response, OrderQueryDTO queryOrderDTO) {
+        orderService.exportPartnerOrderList(response, queryOrderDTO);
+    }
 }

--
Gitblit v1.9.3