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

chenlu

2025-10-28 4af4c7b1915a555ab61a8cca3c2ab5875be8a18b

 north-glass-erp/src/main/java/com/example/erp/controller/pp/TagStyleController.java

@@ -20,33 +20,33 @@

    @PostMapping("saveTag")
    public Result saveTag(@RequestBody TagStyle tagStyle){
        return Result.seccess(tagStyleService.saveTag(tagStyle));
        return Result.success(tagStyleService.saveTag(tagStyle));
    }

    @GetMapping("getTagList")
    public Result getTagList(){
        return Result.seccess(tagStyleService.getTagList());
        return Result.success(tagStyleService.getTagList());
    }
    @GetMapping("getTagById/{id}")
    public Result getTagById(@PathVariable("id") Integer id){
        return Result.seccess(tagStyleService.getTagById(id));
        return Result.success(tagStyleService.getTagById(id));
    }

    @PostMapping("deleteTag/{id}")
    public Result deleteTag(@PathVariable("id") Integer id){
        return Result.seccess(tagStyleService.deleteTag(id));
        return Result.success(tagStyleService.deleteTag(id));
    }


    @PostMapping("updateTag")
    public Result updateTag(TagStyle tagStyle){
        return Result.seccess(tagStyleService.updateTag(tagStyle));
        return Result.success(tagStyleService.updateTag(tagStyle));
    }


    @PostMapping("addTag")
    public Result addTag(@RequestBody TagStyle tagStyle){
        return Result.seccess(tagStyleService.addTag(tagStyle));
        return Result.success(tagStyleService.addTag(tagStyle));
    }

    @ApiOperation("修改标签打印次数")
@@ -54,6 +54,6 @@
    public Result updatePrintNumber(
            @RequestBody Map<String, Object> object
    ) {
        return Result.seccess(tagStyleService.updatePrintNumberSv(object));
        return Result.success(tagStyleService.updatePrintNumberSv(object));
    }
}