From a49686ae25f3fc71306a1fd9ed117e8ca89da65b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 27 九月 2024 08:42:18 +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/ReworkController.java | 2 +-
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
index c2297e4..52519a6 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
@@ -61,7 +61,7 @@
}
@ApiOperation("琛ョ墖娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
- @SaCheckPermission("printFlowCard.search")
+ @SaCheckPermission("printReplenishFlowCard.search")
@PostMapping("/selectPrint/{selectTime1}/{selectTime2}")
public Result selectPrint(
@PathVariable Date selectTime1,
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java
index 5d5851d..d570183 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java
@@ -60,7 +60,7 @@
}
@ApiOperation("杩斿伐娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
- @SaCheckPermission("printFlowCard.search")
+ @SaCheckPermission("printReworkFlowCard.search")
@PostMapping("/selectPrint/{selectTime1}/{selectTime2}")
public Result selectPrint(
@PathVariable Date selectTime1,
--
Gitblit v1.8.0