Merge branch '1.3.1'

wjc

1 天以前 c19f27f32f3c3d2caf82ddbdc3b2602ee3610e46

 app/src/main/java/com/hdl/photovoltaic/ui/bean/OidBean.java

@@ -70,13 +70,6 @@
        this.device_mac = device_mac;
    }

    public List<ImageInfo> getImage_info() {
        return image_info;
    }

    public void setImage_info(List<ImageInfo> image_info) {
        this.image_info = image_info;
    }


    public String getProtocolType() {
@@ -143,6 +136,14 @@
        this.parentOid = parentOid;
    }

    public List<ImageInfo> getImage_info() {
        return image_info;
    }

    public void setImage_info(List<ImageInfo> image_info) {
        this.image_info = image_info;
    }

    public static class ImageInfo {
        private String imageId;
        private String fw_version;