From 9de2f4b748f46aeab806d6f3ff83034bbbdb5d9d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 01 三月 2024 15:20:53 +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 | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 aabb990..7b684b6 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
@@ -3,10 +3,7 @@
import com.example.erp.common.Result;
import com.example.erp.service.sd.BasicDateService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.Map;
@@ -19,4 +16,12 @@
public Result getOrderBasicData(){
return Result.seccess(basicDateService.getOrderBasicData());
}
+ @GetMapping("/BasicDataByType/{type}")
+ public Result getBasicDataByType(@PathVariable String type){
+ return Result.seccess(basicDateService.getBasicDataByType(type));
+ }
+ @GetMapping("/BasicDataByType/{type}/{childType}")
+ public Result getBasicDataByTypeAndChildType(@PathVariable String type,@PathVariable String childType){
+ return Result.seccess(basicDateService.getBasicDataByTypeAndChildType(type,childType));
+ }
}
--
Gitblit v1.8.0