Merge branch 'rcs_master' into ctu_conveyor

zhang

7 天以前 39efc87b3794f957aad73acf3a430b84e3a19b27

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/StaReserveMapper.java

@@ -17,4 +17,21 @@
            , @Param("state") String state
    );

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

}