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

廖井涛

2024-08-06 3f35b3c03d8a196f6e7724de8a01ddb9ba30a22a

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

@@ -70,10 +70,11 @@
    }

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

    }
}