From a22d95d8114554176d7466999c80c9b646364bfe Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 28 Apr 2023 00:30:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
index 8c6dff3..b7988f6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
@@ -188,8 +188,8 @@
*/
@PostMapping("patrol-complete-task")
@ApiOperation(value = "完成任务", notes = "传入流程信息")
- public R completeTask(PatrolTask patrolTask, String currentUserId) {
- return R.status(patrolTaskService.patrolCompleteTask(patrolTask,currentUserId));
+ public R completeTask(PatrolTask patrolTask, String currentUserId,String taskUser) {
+ return R.status(patrolTaskService.patrolCompleteTask(patrolTask,currentUserId,taskUser));
}
/**
--
Gitblit v1.9.3