Merge branch 'feature/v1.4.0' into feature/v1.4.1

mac

2024-06-05 c1755223fd042d0411ab29708c5a848085c4cee9

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

@@ -22,7 +22,6 @@
    private String device_mac;//本地的mac
    private List<ImageInfo> image_info;


    public String getDriver_code() {
        return driver_code == null ? "" : driver_code;
    }
@@ -70,7 +69,6 @@
    public void setDevice_mac(String device_mac) {
        this.device_mac = device_mac;
    }




@@ -169,4 +167,4 @@
    }


}
}