Merge branch 'rcs_master' into ctu_conveyor

zhang

昨天 8dfcfee645b874b785e39bc33c578ba4e1e9a38b

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TravelService.java

@@ -11,4 +11,12 @@

    Travel findRunningTravel(Long agvId);

    Travel findRollerWaitingTravel(Long agvId, Long code);

    Boolean hasRollerWaiting(Long agvId);

    Boolean markRollerWaiting(Long travelId, Long codeId);

    Boolean clearRollerWaiting(Long travelId);

}