From 4098ea2b95d6da283ac62f2ebb30ce37fe0d6d3f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 05 七月 2024 10:12:31 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
index 4109491..d326354 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
@@ -42,7 +42,7 @@
}
}
- @ApiOperation("璁㈠崟淇濆瓨")
+ @ApiOperation("璁㈠崟琛ㄥご淇濆瓨")
@PostMapping("/saveOrderTitle")
@SaCheckPermission("createOrder.add")
public Result saveOrderTitle(@RequestBody Map<String, Object> orderMap) throws Exception {
@@ -185,10 +185,10 @@
return Result.seccess(orderService.printOrderProductGlassDetail(orderId));
}
@ApiOperation("璁㈠崟鍔犲伐鍗曟墦鍗�-鎴愬搧2")
- @GetMapping ("/printOrderProductDetail/{orderId}/{productId}")
- public Result printOrderProductDetail(@PathVariable String orderId,@PathVariable String productId) {
+ @GetMapping ("/printOrderProductDetail/{orderId}/{selectedValues}")
+ public Result printOrderProductDetail(@PathVariable String orderId,@PathVariable List<String> selectedValues) {
- return Result.seccess(orderService.printOrderProductDetails(orderId,productId));
+ return Result.seccess(orderService.printOrderProductDetails(orderId,selectedValues));
}
--
Gitblit v1.8.0