From 67e1e623bdd4b59ac5f1bdb16363a66a511ebdaa Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期二, 20 五月 2025 12:31:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsMaterialProductGroupManagementController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsMaterialProductGroupManagementController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsMaterialProductGroupManagementController.java
index 7e703c2..347af56 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsMaterialProductGroupManagementController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsMaterialProductGroupManagementController.java
@@ -37,7 +37,7 @@
* 鏌ヨ鐗╂枡浜у搧缁勬暟鎹鐞嗗垪琛�
*/
@Operation(summary = "鏌ヨ鐗╂枡浜у搧缁勬暟鎹鐞嗗垪琛�", description = "鍒嗛〉鏌ヨ")
-// @RequiresPermissions("materialProductGroup:management:list")
+ @RequiresPermissions("materialProductGroup:management:list")
@GetMapping("/list")
public TableDataInfo list(ApsMaterialProductGroupManagement apsGasPipelineMo)
{
@@ -47,9 +47,9 @@
}
- @Operation(summary = "瀵煎叆鎵嬪伐姘斾綋棰勬祴鏁版嵁", description = "鎵归噺瀵煎叆")
- @Log(title = "瀵煎叆鎵嬪伐姘斾綋棰勬祴鏁版嵁", businessType = BusinessType.IMPORT)
-// @RequiresPermissions("materialProductGroup:mo:import")
+ @Operation(summary = "瀵煎叆浜у搧缁勬暟鎹�", description = "鎵归噺瀵煎叆")
+ @Log(title = "瀵煎叆浜у搧缁勬暟鎹�", businessType = BusinessType.IMPORT)
+ @RequiresPermissions("materialProductGroup:management:import")
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file) throws Exception {
@@ -60,7 +60,7 @@
* 瀵煎嚭鐗╂枡浜у搧缁勬暟鎹鐞嗗垪琛�
*/
@Operation(summary = "瀵煎嚭鐗╂枡浜у搧缁勬暟鎹鐞嗗垪琛�", description = "瀵煎嚭")
-// @RequiresPermissions("materialProductGroup:management:export")
+ @RequiresPermissions("materialProductGroup:management:export")
@Log(title = "鐗╂枡浜у搧缁勬暟鎹鐞�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApsMaterialProductGroupManagement apsMaterialProductGroupManagement)
@@ -85,7 +85,7 @@
* 鏂板鐗╂枡浜у搧缁勬暟鎹鐞�
*/
@Operation(summary = "鏂板鐗╂枡浜у搧缁勬暟鎹鐞�", description = "鍗曚釜鏂板")
-// @RequiresPermissions("materialProductGroup:management:add")
+ @RequiresPermissions("materialProductGroup:management:add")
@Log(title = "鐗╂枡浜у搧缁勬暟鎹鐞�", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ApsMaterialProductGroupManagement apsMaterialProductGroupManagement)
@@ -97,8 +97,8 @@
* 淇敼鐗╂枡浜у搧缁勬暟鎹鐞�
*/
@Operation(summary = "淇敼鐗╂枡浜у搧缁勬暟鎹鐞�", description = "鍗曚釜淇敼")
-// @RequiresPermissions("materialProductGroup:management:edit")
- @Log(title = "鐗╂枡浜у搧缁勬暟鎹鐞�", businessType = BusinessType.UPDATE)
+ @RequiresPermissions("materialProductGroup:management:edit")
+ @Log(title = "淇敼鐗╂枡浜у搧缁勬暟鎹鐞�", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ApsMaterialProductGroupManagement apsMaterialProductGroupManagement)
{
@@ -109,7 +109,7 @@
* 鍒犻櫎鐗╂枡浜у搧缁勬暟鎹鐞�
*/
@Operation(summary = "鍒犻櫎鐗╂枡浜у搧缁勬暟鎹鐞�", description = "鎵归噺鍒犻櫎")
-// @RequiresPermissions("materialProductGroup:management:remove")
+ @RequiresPermissions("materialProductGroup:management:remove")
@Log(title = "鐗╂枡浜у搧缁勬暟鎹鐞�", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
--
Gitblit v1.9.3