From ff195859283806241f3cb40e33170dd77a7eed61 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 09 七月 2025 14:28:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java |    3 ++-
 1 files changed, 2 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 8e655a8..42d6362 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
@@ -25,6 +25,7 @@
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutionException;
 
 @RestController
 @Api(value = "鐢熶骇鎶ヨ〃controller", tags = {"鐢熶骇鎶ヨ〃鎿嶄綔鎺ュ彛"})
@@ -38,7 +39,7 @@
 
     //娴佺▼鍗¤繘搴�
     @ApiOperation("娴佺▼鍗¤繘搴�")
-    @SaCheckPermission("processCardProgress.search")
+    @SaCheckPermission("selectOrder.search")
     @PostMapping("/processCardProgress/{orderId}")
     public Result processCardProgress(@PathVariable String orderId, @RequestBody List<Integer> columns) {
         return Result.seccess(reportService.processCardProgressSv(orderId, columns));

--
Gitblit v1.8.0