From 1750abd11320f8d09ffe1580b7467dba87c86c89 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 10 十二月 2025 14:40:25 +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/DeviceMaintenanceController.java |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java
index 8f5ff0c..6ed2503 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java
@@ -22,11 +22,11 @@
     DeviceMaintenanceService deviceMaintenanceService;
 
     @ApiOperation("璁惧鏂板鎺ュ彛")
-    @SaCheckPermission("AddMachine.add")
+    @SaCheckPermission("addMachine.add")
     @PostMapping("/saveMachine")
     public Result saveTeamGroup( @RequestBody Map<String,Object> object){
         if(deviceMaintenanceService.saveMachineSv(object)){
-            return Result.seccess();
+            return Result.success();
         }else {
             throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
 
@@ -35,15 +35,15 @@
     @ApiOperation("鏌ヨ涓嬫媺妗嗘暟鎹帴鍙�")
     @PostMapping  ("/selectData")
     public Result selectData()  {
-        return  Result.seccess(deviceMaintenanceService.selectDataSv());
+        return  Result.success(deviceMaintenanceService.selectDataSv());
     }
 
     @ApiOperation("淇濆吇缁翠慨鏂板鎺ュ彛")
-    @SaCheckPermission("AddMaintenanceAndRepair.add")
+    @SaCheckPermission("addMaintenanceAndRepair.add")
     @PostMapping("/saveMaintenanceAndRepair")
     public Result saveMaintenanceAndRepair( @RequestBody Map<String,Object> object){
         if(deviceMaintenanceService.saveMaintenanceAndRepairSv(object)){
-            return Result.seccess();
+            return Result.success();
         }else {
             throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
 
@@ -56,16 +56,16 @@
             @PathVariable Date selectTime1,
             @PathVariable Date selectTime2
     )  {
-        return  Result.seccess(deviceMaintenanceService.selectMaintenanceSv(selectTime1,selectTime2));
+        return  Result.success(deviceMaintenanceService.selectMaintenanceSv(selectTime1,selectTime2));
     }
 
 
     @ApiOperation("鍒犻櫎缁翠慨淇濆吇璁板綍鎺ュ彛")
-    @SaCheckPermission("MaintenanceAndRepair.delete")
+    @SaCheckPermission("maintenanceAndRepair.delete")
     @PostMapping("/deleteMaintenance/{id}")
     public Result deleteMaintenance(@PathVariable String id){
         if(deviceMaintenanceService.deleteMaintenanceSv(id)){
-            return Result.seccess();
+            return Result.success();
         }else {
             throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触锛�");
 
@@ -73,17 +73,17 @@
     }
 
     @ApiOperation("鏌ヨ璁惧绠＄悊鎺ュ彛")
-    @SaCheckPermission("SelectMachine.search")
+    @SaCheckPermission("selectMachine.search")
     @PostMapping  ("/selectMachine")
     public Result selectMachine()  {
-        return  Result.seccess(deviceMaintenanceService.selectMachineSv());
+        return  Result.success(deviceMaintenanceService.selectMachineSv());
     }
 
     @ApiOperation("鏍规嵁Id鏌ヨ瀵瑰簲鏁版嵁鎺ュ彛")
     @PostMapping  ("/openSelectId/{id}")
     public Result openSelectId(
             @PathVariable String id){
-        return Result.seccess(deviceMaintenanceService.openSelectIdSv(id));
+        return Result.success(deviceMaintenanceService.openSelectIdSv(id));
 
     }
 
@@ -92,6 +92,6 @@
     public Result deleteOrderWork(
             @RequestBody Map<String,Object> object
     ){
-        return  Result.seccess(deviceMaintenanceService.updateMaintenance(object));
+        return  Result.success(deviceMaintenanceService.updateMaintenance(object));
     }
 }

--
Gitblit v1.8.0