Merge branch 'rcs_master' into ctu_conveyor

zhang

昨天 8dfcfee645b874b785e39bc33c578ba4e1e9a38b

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

@@ -32,7 +32,7 @@

    Boolean judgeEnable(Long agvId);

    Boolean judgeEnable(Long agvId, Boolean withBattery);
    Boolean judgeEnable(Long agvId, Boolean withBattery, Boolean idleStatus);

    Boolean judgeOnline(Long agvId);