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/BasicOtherMoneyController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicOtherMoneyController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicOtherMoneyController.java
index b82fd64..5cc6190 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicOtherMoneyController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicOtherMoneyController.java
@@ -6,6 +6,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.Map;
+
@RestController
@RequestMapping("/basicOtherMoney")
public class BasicOtherMoneyController {
@@ -18,17 +20,22 @@
@GetMapping("findAll")
@PostMapping("findAll")
public Result findAll(){
- return Result.seccess(basicOtherMoneyService.findAll());
+ return Result.success(basicOtherMoneyService.findAll());
}
@PostMapping("deleteById/{id}")
public Result deleteById(@PathVariable("id") Integer id){
- return Result.seccess(basicOtherMoneyService.deleteById(id));
+ return Result.success(basicOtherMoneyService.deleteById(id));
}
@PostMapping("save")
- public Result save(String alias){
- return Result.seccess(basicOtherMoneyService.save(alias));
+ public Result save(@RequestBody Map<String,String> alias){
+ return Result.success(basicOtherMoneyService.save(alias.get("alias")));
+ }
+
+ @PostMapping("findAllByState")
+ public Result findAllByState(){
+ return Result.success(basicOtherMoneyService.findAllByState());
}
}
--
Gitblit v1.8.0