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/service/IPatrolTaskService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java
index 26c2c29..104d86d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java
@@ -57,7 +57,7 @@
 	 */
 	boolean startProcess(PatrolTask patrolTask);
 
-	boolean patrolCompleteTask(PatrolTask patrolTask,String currentUserId);
+	boolean patrolCompleteTask(PatrolTask patrolTask,String currentUserId,String taskUser);
 
 	boolean chargeCompletePerson(BladeFlowTask bladeFlowTask);
 

--
Gitblit v1.9.3