From af5081bc0d0668d526a204076557a171097ddb8d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 二月 2026 14:02:59 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into ctu_conveyor

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/StaReserveMapper.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/StaReserveMapper.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/StaReserveMapper.java
index d091148..8b21301 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/StaReserveMapper.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/StaReserveMapper.java
@@ -19,6 +19,15 @@
 
     int updateStateToWaiting(
             @Param("taskId") Long taskId
+            , @Param("segmentId") Long segId
+            , @Param("staId") Long staId
+            , @Param("type") String type
+            , @Param("state") String state
+            , @Param("extendMs") Long extendMs
+    );
+
+    int updateStateBackToWaiting(
+            @Param("taskId") Long taskId
             , @Param("staId") Long staId
             , @Param("type") String type
             , @Param("state") String state

--
Gitblit v1.9.1