Merge branch 'refs/heads/rcs_master' into jdxaj

zhang

昨天 70930071a49190f414c8d8bc9c9e9795a4096739

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapAgvVo.java

@@ -32,6 +32,8 @@

    private Double direction = 0.0;

    private String error = "-";

    private List<BackpackDto> backpack = new ArrayList<>();

    private List<Long> taskIds = new ArrayList<>();