Merge branch 'refs/heads/rcs_master' into ctu_conveyor

zhang

昨天 af5081bc0d0668d526a204076557a171097ddb8d

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

@@ -9,6 +9,8 @@

public interface BusService extends IService<Bus> {

    Bus selectByBusNo(String busNo);

    Bus selectByUuid(String uuid);

    String checkoutValid(OpenBusSubmitParam param);