Merge branch 'rcs_master' into ctu_conveyor

zhang

昨天 8dfcfee645b874b785e39bc33c578ba4e1e9a38b

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

@@ -7,4 +7,8 @@

    AgvModel selectByType(String type);

    AgvModel getByAgvId(Long agvId);

    AgvModel getByAgvNo(String agvNo);

}