From b6831163ebaefff36901a100faae6dcf538b1215 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 03 九月 2025 13:12:11 +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/ReportController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
index 290d85e..c18d97f 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
@@ -31,7 +31,7 @@
     //娴佺▼鍗¤繘搴�
     @ApiOperation("璁㈠崟娴佺▼鍗¤繘搴�")
     @PostMapping("/processCardProgress/{orderId}")
-    public Result processCardProgress(@PathVariable String orderId, @RequestBody List<Integer> columns) {
+    public Result processCardProgress(@PathVariable String orderId, @RequestBody List<String> columns) {
         return Result.seccess(reportService.processCardProgressSv(orderId, columns));
     }
     @ApiOperation("鎶ヨ〃娴佺▼鍗¤繘搴�")

--
Gitblit v1.8.0