From d3dfcd3e96cb0f2b04cfe973e4f348ee5fe96032 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 26 八月 2024 14:02:22 +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 | 6 ++++++
1 files changed, 6 insertions(+), 0 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 abca359..b29e992 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
@@ -330,4 +330,10 @@
@RequestBody Map<String, Object> object) {
return Result.seccess(flowCardService.selectSortTableSv(object));
}
+
+ @ApiOperation("鍚堝苟娴佺▼鍗℃帴鍙�")
+ @PostMapping("/mergeFlowCard")
+ public Result mergeFlowCard(@RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.mergeFlowCard(object));
+ }
}
--
Gitblit v1.8.0