From 9425caa266245d82e7442f93cd47c5e263be2242 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 10 四月 2025 16:50:37 +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/pp/ProcessCardController.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 b14eb64..8ece1ca 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
@@ -375,9 +375,10 @@
     }
 
     @ApiOperation("鍚堝苟娴佺▼鍗℃帴鍙�")
-    @PostMapping("/mergeFlowCard")
-    public Result mergeFlowCard(@RequestBody Map<String, Object> object) {
-        return Result.seccess(flowCardService.mergeFlowCard(object));
+    @PostMapping("/mergeFlowCard/{merge}")
+    public Result mergeFlowCard(@RequestBody Map<String, Object> object,
+                                @PathVariable Integer merge) {
+        return Result.seccess(flowCardService.mergeFlowCard(object,merge));
     }
     @ApiOperation("姹夌幓鑾峰彇娴佺▼鍗℃帴鍙�")
     @PostMapping("/getProcessCardList/hanbo")

--
Gitblit v1.8.0