From 352ea6a79d6d1e470d53b4a4f3800d183d0f40d4 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 16 七月 2024 10:18:39 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
index 16256e3..bb6ed9e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
@@ -169,20 +169,20 @@
@ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
@SaCheckPermission("PrintFlowCard.search")
- @PostMapping("/selectPrint/{orderId}")
+ @PostMapping("/selectPrint")
public Result selectPrint(
- @PathVariable String orderId,
- @RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.selectPrintSv(orderId, flowCard));
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.selectPrintSv(object));
}
@ApiOperation("鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
- @PostMapping("/getSelectPrinting/{printMerge}")
+ @PostMapping("/getSelectPrinting/{printMerge}/{printLike}")
public Result getSelectPrinting(
@PathVariable String printMerge,
+ @PathVariable String printLike,
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge));
+ return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike));
}
@ApiOperation("鎵撳嵃鏍囩鏁版嵁鏌ヨ鎺ュ彛")
--
Gitblit v1.8.0