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/sd/BasicDataController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicDataController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicDataController.java
index 142087d..65a0447 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicDataController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicDataController.java
@@ -23,15 +23,15 @@
@GetMapping("/orderBasicData")
public Result getOrderBasicData(){
- return Result.seccess(basicDataService.getOrderBasicData());
+ return Result.success(basicDataService.getOrderBasicData());
}
@GetMapping("/BasicDataByType/{type}")
public Result getBasicDataByType(@PathVariable String type){
- return Result.seccess(basicDataService.getBasicDataByType(type));
+ return Result.success(basicDataService.getBasicDataByType(type));
}
@GetMapping("/BasicDataByType/{type}/{childType}")
public Result getBasicDataByTypeAndChildType(@PathVariable String type,@PathVariable String childType){
- return Result.seccess(basicDataService.getBasicDataByTypeAndChildType(type,childType));
+ return Result.success(basicDataService.getBasicDataByTypeAndChildType(type,childType));
}
@@ -39,32 +39,32 @@
@SaCheckPermission("searchOrderBasicData.search")
@GetMapping("/getBasicData")
public Result getBasicData(){
- return Result.seccess(basicDataService.getBasicData());
+ return Result.success(basicDataService.getBasicData());
}
@ApiOperation("鏌ヨ鍩虹鏁版嵁绫诲瀷")
@SaCheckPermission("searchOrderBasicData.search")
@GetMapping("/getBasicDataType")
public Result getBasicDataType(){
- return Result.seccess(basicDataService.getBasicDataType());
+ return Result.success(basicDataService.getBasicDataType());
}
@ApiOperation("鏂板鍩虹鏁版嵁")
@SaCheckPermission("searchOrderBasicData.add")
@PostMapping("addBasicData")
public Result addBasicData(@RequestBody Map<String,Object> map){
- return Result.seccess(basicDataService.addBasicData(map));
+ return Result.success(basicDataService.addBasicData(map));
}
@ApiOperation("鏇存柊鍩虹鏁版嵁")
@SaCheckPermission("searchOrderBasicData.update")
@PostMapping("updateBasicData")
public Result updateBasicData(@RequestBody BasicData basicData){
- return Result.seccess(basicDataService.updateBasicData(basicData));
+ return Result.success(basicDataService.updateBasicData(basicData));
}
@ApiOperation("鍒犻櫎鍩虹鏁版嵁")
@SaCheckPermission("searchOrderBasicData.delete")
@PostMapping("deleteBasicData")
public Result deleteBasicData(@RequestBody BasicData basicData){
- return Result.seccess(basicDataService.deleteBasicData(basicData));
+ return Result.success(basicDataService.deleteBasicData(basicData));
}
}
--
Gitblit v1.8.0