From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/OidBean.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/OidBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/OidBean.java
index 41ad902..842ea99 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/OidBean.java
+++ b/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;
--
Gitblit v1.8.0