Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2025-11-20 e00b54ec7322cf7cba5883e17f2e2843f71b8833

 north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicGlassTypeController.java

@@ -15,36 +15,36 @@

    @GetMapping("/getOneLevel")
    public Result getOneLevel(){
        return Result.seccess(basicGlassTypeServise.getOneLevel());
        return Result.success(basicGlassTypeServise.getOneLevel());
    }
    @GetMapping("/getTwoLevel")
    public Result getTwoLevel(){
        return Result.seccess(basicGlassTypeServise.getTwoLevel());
        return Result.success(basicGlassTypeServise.getTwoLevel());
    }

    @GetMapping("/getAll")
    public Result getAll(){
        return Result.seccess(basicGlassTypeServise.getAll());
        return Result.success(basicGlassTypeServise.getAll());
    }

    @GetMapping("/findAll")
    public Result findAll(){
        return Result.seccess(basicGlassTypeServise.findAll());
        return Result.success(basicGlassTypeServise.findAll());
    }

    @GetMapping("/deleteById/{id}")
    public Result deleteById(@PathVariable Integer id){
        return Result.seccess(basicGlassTypeServise.deleteById(id));
        return Result.success(basicGlassTypeServise.deleteById(id));
    }

    @GetMapping("/getOneLevelListMap")
    public Result getOneLevelListMap(){
        return Result.seccess(basicGlassTypeServise.getOneLevelListMap());
        return Result.success(basicGlassTypeServise.getOneLevelListMap());
    }

    @PostMapping("/add")
    public Result add(@RequestBody Map<String,Object> map){
        return Result.seccess(basicGlassTypeServise.add(map));
        return Result.success(basicGlassTypeServise.add(map));
    }

}