Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

 src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java

@@ -126,7 +126,7 @@
   @ApiOperationSupport(order = 7)
   @ApiOperation(value = "逻辑删除", notes = "传入ids")
   public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
      return R.status(taskLabelReportingEventService.removeByIds(Func.toLongList(ids)));
      return R.status(taskLabelReportingEventService.removeTaskByIds(Func.toLongList(ids)));
   }

   /**