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

guoyujie

2025-10-23 cc8efc81d2d35bed40e47d0a5b0920a4b6f8095f

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

@@ -76,4 +76,13 @@
    public Result deleteRework( @RequestBody Map<String,Object> object){
        return Result.seccess(reworkService.deleteReworkSv(object));
    }

    @ApiOperation("返工打印自定义标签数据查询接口")
    @PostMapping("/getSelectReworkPrintCustomLabel/{type}/{lableType}")
    public Result getSelectReworkPrintCustomLabel( @PathVariable String type,
                                                   @PathVariable Integer lableType,
                                                   @RequestBody Map<String, Object> object) {
        return Result.seccess(reworkService.getSelectReworkPrintCustomLabel(type,lableType,object));

    }
}