Merge remote-tracking branch 'origin/master'

于杰

2025-08-04 fd89fbfa59d40f4016b43bcac8286bdcdb5e4df9

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

@@ -89,8 +89,10 @@
    @ApiOperation("删除报工接口")
    @SaCheckPermission("selectReportingWorks.delete")
    @PostMapping("/deleteWork/{reportingWorkId}/{processId}/{thisProcess}/{userId}/{userName}")
    public Result deleteWork(@PathVariable String reportingWorkId,@PathVariable String processId,
                             @PathVariable String thisProcess,@PathVariable String userId
    public Result deleteWork(@PathVariable String reportingWorkId,
                             @PathVariable String processId,
                             @PathVariable String thisProcess,
                             @PathVariable String userId
    ,@PathVariable String userName){

        return Result.seccess(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess,userId,userName));