From 3d66a05e01b17a57f80a422b19fbbff92a69c080 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 19 二月 2025 16:15:03 +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 |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 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..c9ad891 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 {
@@ -27,8 +29,13 @@
     }
 
     @PostMapping("save")
-    public Result save(String  alias){
-        return  Result.seccess(basicOtherMoneyService.save(alias));
+    public Result save(@RequestBody Map<String,String> alias){
+        return  Result.seccess(basicOtherMoneyService.save(alias.get("alias")));
+    }
+
+    @PostMapping("findAllByState")
+    public Result findAllByState(){
+        return  Result.seccess(basicOtherMoneyService.findAllByState());
     }
 
 }

--
Gitblit v1.8.0