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/mapper/StaReserveMapper.java | 10 ++++++++++
1 files changed, 10 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 4f69f87..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,9 +19,19 @@
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
+ , @Param("extendMs") Long extendMs
);
}
--
Gitblit v1.9.1