From 8bbe2bb92ddfeb1766eb7324a6c39acd5e2b1c5c Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 09 五月 2025 10:21:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java
index f878ca4..065b168 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java
@@ -3,6 +3,7 @@
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.common.core.web.page.TableDataInfo;
+import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsPlateOrderPlanDate;
import com.aps.core.domain.ApsPlateOrderPlanManager;
import com.aps.core.domain.ApsPlateStandardRequire;
@@ -28,7 +29,7 @@
/**
* 鏌ヨ閽ｉ噾宸ュ崟璁″垝
*/
-// @RequiresPermissions("ApsPlatOrderPlanManager:list")
+ @RequiresPermissions("ApsPlatOrderPlanManager:list")
@GetMapping("/list")
public TableDataInfo list(ApsPlateOrderPlanManager apsPlateOrderPlanManager)
{
@@ -40,7 +41,7 @@
/**
* 鏌ヨ閽ｉ噾宸ュ崟闇�姹�
*/
-// @RequiresPermissions("ApsPlatOrderPlanManager:requirement:list")
+ @RequiresPermissions("ApsPlatOrderPlanManager:requirement:list")
@GetMapping("/requirement/list")
public List<ApsPlateStandardRequire> list(String workOrderNo)
{
@@ -48,6 +49,7 @@
return list;
}
+ @RequiresPermissions("ApsPlatOrderPlanManager:planDate:edit")
@PutMapping("/planDate")
public AjaxResult list(@RequestBody ApsPlateOrderPlanDate apsPlateOrderPlanDate)
{
--
Gitblit v1.9.3