From b0a4de74b47e2626f51eb4a844db3e62f6a4bf9d Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 18 十二月 2025 10:52:48 +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/mm/MaterialStoreController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java b/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java
index 72862ea..2263f95 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java
@@ -25,35 +25,35 @@
@SaCheckPermission("createIngredients.add")
@PostMapping("/saveMaterialStore")
public Result saveMaterialStore( @RequestBody Map<String,Object> object){
- return Result.seccess(materialStoreService.saveMaterialStore(object));
+ return Result.success(materialStoreService.saveMaterialStore(object));
}
@ApiOperation("鐗╂枡鏌ヨ鎺ュ彛")
@SaCheckPermission("selectIngredients.search")
@PostMapping("/getSelectMaterialStore/{pageNum}/{pageSize}")
public Result getSelectMaterialStore(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialStore materialStore){
- return Result.seccess(materialStoreService.getSelectMaterialStore(pageNum,pageSize,materialStore));
+ return Result.success(materialStoreService.getSelectMaterialStore(pageNum,pageSize,materialStore));
}
@ApiOperation("浜у搧Bom鐗╂枡鏌ヨ鎺ュ彛")
@SaCheckPermission("selectIngredients.search")
@PostMapping("/getSelectProductBOM/{pageNum}/{pageSize}")
public Result getSelectProductBOM(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialStore materialStore){
- return Result.seccess(materialStoreService.getSelectProductBOM(pageNum,pageSize,materialStore));
+ return Result.success(materialStoreService.getSelectProductBOM(pageNum,pageSize,materialStore));
}
@ApiOperation("鐗╂枡鏌ヨ鎺ュ彛")
@SaCheckPermission("selectIngredients.search")
@PostMapping("/getSelectMaterialStore")
public Result getSelectMaterialStores(@RequestBody MaterialStore materialStore){
- return Result.seccess(materialStoreService.getSelectMaterialStores(materialStore));
+ return Result.success(materialStoreService.getSelectMaterialStores(materialStore));
}
@ApiOperation("鐗╂枡鍒犻櫎鎺ュ彛")
@SaCheckPermission("selectIngredients.delete")
@PostMapping("/deleteMaterialStore")
public Result deleteMaterialStore( @RequestBody Map<String,Object> object){
- return Result.seccess(materialStoreService.deleteMaterialStore(object));
+ return Result.success(materialStoreService.deleteMaterialStore(object));
}
--
Gitblit v1.8.0