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

zhangc

6 天以前 84e12ecd3923f28b62b8659b138a554b0f6e084d

 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
    );

}