Merge remote-tracking branch 'origin/rcs_master' into rcs_master

zhangc

7 天以前 84e12ecd3923f28b62b8659b138a554b0f6e084d

 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}