From 84e12ecd3923f28b62b8659b138a554b0f6e084d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 30 一月 2026 15:16:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rcs_master' into rcs_master

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java
index ad72354..5505d5f 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java
@@ -4,7 +4,7 @@
 import com.zy.acs.manager.common.domain.BaseParam;
 import com.zy.acs.manager.common.domain.PageParam;
 import com.zy.acs.manager.common.domain.PageResult;
-import com.zy.acs.manager.core.domain.Lane;
+import com.zy.acs.manager.core.domain.LaneDto;
 import com.zy.acs.manager.manager.entity.Task;
 import com.zy.acs.manager.manager.enums.TaskStsType;
 
@@ -31,9 +31,9 @@
 
     Boolean cancel(Long taskId, Long userId);
 
-    Lane checkoutOriginLane(Task task);
+    LaneDto checkoutOriginLane(Task task);
 
-    Lane checkoutDestinationLane(Task task);
+    LaneDto checkoutDestinationLane(Task task);
 
     List<Task> findRunningTasksByLaneHash(String laneHash);
 

--
Gitblit v1.9.1