From e8ba2a1bec7ffbd78cb941521b31d000890e66de Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 27 二月 2024 14:04:16 +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 |    4 ++++
 1 files changed, 4 insertions(+), 0 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 dbc54a8..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
@@ -20,4 +20,8 @@
     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