Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-02-27 900b4223386a8010e80f1091c4371c19e9117d63

 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));
    }
}