Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

 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));
   }

   /**
@@ -102,6 +102,16 @@
   }

   /**
    * 居住证申请 审核
    */
   @PostMapping("/auditing")
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "审核", notes = "传入taskResidencePermitApply")
   public R updateResidencePermitApply(@Valid @RequestBody TaskResidencePermitApplyEntity taskResidencePermitApply) {
      return R.status(taskResidencePermitApplyService.updateResidencePermitApplyEntity(taskResidencePermitApply));
   }

   /**
    * 居住证申请 新增或修改
    */
   @PostMapping("/submit")