Merge branch 'rcs_master' into ctu_conveyor

zhang

2 天以前 8dfcfee645b874b785e39bc33c578ba4e1e9a38b

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/MapDataParam.java

@@ -14,6 +14,8 @@

    private Long zoneId;

    private Integer floor;

    private List<MapItem> itemList;

}