From 91b61fe723df498d62c596372521d426299f0f8b Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 09 六月 2025 16:54:26 +0800
Subject: [PATCH] 标签不显示标题问题

---
 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