From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java b/src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java
index cfde48d..5029c99 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java
+++ b/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")

--
Gitblit v1.9.3