From a9cf56a7be8b5e27e2c3dcb416b734093e7a8dc3 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 28 一月 2026 12:54:15 +0800
Subject: [PATCH] Merge branch 'rcs_master' into ctu_conveyor
---
zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml
index 276331e..94eaa96 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml
+++ b/zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml
@@ -19,7 +19,7 @@
UPDATE man_sta_reserve
SET state = #{state},
waiting_at = IFNULL(waiting_at, NOW()),
- expire_time = DATE_ADD(NOW(), INTERVAL #{extendMs} MILLISECOND),
+ expire_time = DATE_ADD(NOW(), INTERVAL #{extendMs} SECOND),
update_time = NOW()
WHERE task_id = #{taskId}
AND sta_id = #{staId}
@@ -31,7 +31,7 @@
<update id="updateStateBackToWaiting">
UPDATE man_sta_reserve
SET state = #{state},
- expire_time = DATE_ADD(NOW(), INTERVAL #{extendMs} MILLISECOND),
+ expire_time = DATE_ADD(NOW(), INTERVAL #{extendMs} SECOND),
update_time = NOW()
WHERE task_id = #{taskId}
AND sta_id = #{staId}
--
Gitblit v1.9.1