From 77c7984fb636f81a87208aea2bcffc701f6419e8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 23 十月 2024 16:01:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java
index c0c3aff..1aee90c 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java
@@ -28,7 +28,7 @@
 
 @RestController
 @Api(value="鍙戣揣controller",tags={"鍙戣揣鎿嶄綔鎺ュ彛"})
-@RequestMapping("/Delivery")
+@RequestMapping("/delivery")
 public class DeliveryController {
     @Autowired
     DeliveryService deliveryService;
@@ -110,9 +110,9 @@
 
     @ApiOperation("璁㈠崟鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
     @SaCheckPermission("selectDelivery.search")
-    @PostMapping("/getSelectOrderPrinting")
-    public Result getSelectOrderPrinting( @RequestBody OrderDetail orderDetail){
-        return Result.seccess(deliveryService.getSelectOrderPrinting(orderDetail));
+    @PostMapping("/getSelectOrderPrinting/{selectedValues}")
+    public Result getSelectOrderPrinting(@PathVariable List<String> selectedValues, @RequestBody OrderDetail orderDetail){
+        return Result.seccess(deliveryService.getSelectOrderPrinting(orderDetail,selectedValues));
     }
 
     @ApiOperation("鍙戣揣鏄庣粏鎶ヨ〃")

--
Gitblit v1.8.0