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

廖井涛

8 天以前 ceb1dea2b24d5c3216816f42fd0e514613656416

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

@@ -23,15 +23,15 @@

    @GetMapping("/orderBasicData")
    public Result getOrderBasicData(){
        return Result.seccess(basicDataService.getOrderBasicData());
        return Result.success(basicDataService.getOrderBasicData());
    }
    @GetMapping("/BasicDataByType/{type}")
    public Result getBasicDataByType(@PathVariable String type){
        return Result.seccess(basicDataService.getBasicDataByType(type));
        return Result.success(basicDataService.getBasicDataByType(type));
    }
    @GetMapping("/BasicDataByType/{type}/{childType}")
    public Result getBasicDataByTypeAndChildType(@PathVariable String type,@PathVariable String childType){
        return Result.seccess(basicDataService.getBasicDataByTypeAndChildType(type,childType));
        return Result.success(basicDataService.getBasicDataByTypeAndChildType(type,childType));
    }


@@ -39,32 +39,32 @@
    @SaCheckPermission("searchOrderBasicData.search")
    @GetMapping("/getBasicData")
    public Result getBasicData(){
        return Result.seccess(basicDataService.getBasicData());
        return Result.success(basicDataService.getBasicData());
    }
    @ApiOperation("查询基础数据类型")
    @SaCheckPermission("searchOrderBasicData.search")
    @GetMapping("/getBasicDataType")
    public Result getBasicDataType(){
        return Result.seccess(basicDataService.getBasicDataType());
        return Result.success(basicDataService.getBasicDataType());
    }

    @ApiOperation("新增基础数据")
    @SaCheckPermission("searchOrderBasicData.add")
    @PostMapping("addBasicData")
    public Result addBasicData(@RequestBody Map<String,Object> map){
        return  Result.seccess(basicDataService.addBasicData(map));
        return  Result.success(basicDataService.addBasicData(map));
    }

    @ApiOperation("更新基础数据")
    @SaCheckPermission("searchOrderBasicData.update")
    @PostMapping("updateBasicData")
    public Result updateBasicData(@RequestBody BasicData basicData){
        return  Result.seccess(basicDataService.updateBasicData(basicData));
        return  Result.success(basicDataService.updateBasicData(basicData));
    }
    @ApiOperation("删除基础数据")
    @SaCheckPermission("searchOrderBasicData.delete")
    @PostMapping("deleteBasicData")
    public Result deleteBasicData(@RequestBody BasicData basicData){
        return  Result.seccess(basicDataService.deleteBasicData(basicData));
        return  Result.success(basicDataService.deleteBasicData(basicData));
    }
}