Merge branch 'refs/heads/rcs_master' into jdxaj

zhang

23 小时以前 70930071a49190f414c8d8bc9c9e9795a4096739

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/MapWsAgvVo.java

@@ -21,6 +21,8 @@

    private int backpack = 0;

    private int slots = 0;

    private List<String> dynamicRoute = new ArrayList<>();

    private Integer battery;