Merge remote-tracking branch 'origin/master'

lin

2024-03-14 cae3b043d8a8a08e176839d0c23a4432e5d9f5f4

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

@@ -88,7 +88,7 @@
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "新增", notes = "传入taskResidencePermitApply")
   public R save(@Valid @RequestBody TaskResidencePermitApplyEntity taskResidencePermitApply) {
      return R.status(taskResidencePermitApplyService.save(taskResidencePermitApply));
      return R.status(taskResidencePermitApplyService.saveResidencePermitApplyEntity(taskResidencePermitApply));
   }

   /**