Merge branch 'rcs_master' into ctu_conveyor

zhang

6 天以前 39efc87b3794f957aad73acf3a430b84e3a19b27

 zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml

@@ -18,6 +18,7 @@
    <update id="updateStateToWaiting">
        UPDATE man_sta_reserve
        SET state = #{state},
            segment_id = #{segmentId},
            waiting_at = IFNULL(waiting_at, NOW()),
            expire_time = DATE_ADD(NOW(), INTERVAL #{extendMs} SECOND),
            update_time = NOW()
@@ -31,6 +32,7 @@
    <update id="updateStateBackToWaiting">
        UPDATE man_sta_reserve
        SET state = #{state},
            segment_id = null,
            expire_time = DATE_ADD(NOW(), INTERVAL #{extendMs} SECOND),
            update_time = NOW()
        WHERE task_id = #{taskId}