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 |   91 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 90 insertions(+), 1 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 d154627..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
@@ -1,6 +1,7 @@
 package com.hdl.photovoltaic.ui.bean;
 
 import java.io.Serializable;
+import java.util.List;
 
 public class OidBean implements Serializable {
 
@@ -10,8 +11,65 @@
     private String oid;//璁惧oid
     private String addresses;//瀛愮綉鍙疯澶囧彿
     private String device_model;//璁惧鍨嬪彿
-    private String mac;//璁惧mac/sn
+    private String mac;//浜戠涓婅澶噈ac/sn
     private String parentOid;//鐖惰澶噄d
+
+    private String driver_code;
+    private String hw_version;
+    private String fw_version;
+    private String src;
+    private String from;
+    private String device_mac;//鏈湴鐨刴ac
+    private List<ImageInfo> image_info;
+
+    public String getDriver_code() {
+        return driver_code == null ? "" : driver_code;
+    }
+
+    public void setDriver_code(String driver_code) {
+        this.driver_code = driver_code;
+    }
+
+    public String getHw_version() {
+        return hw_version == null ? "" : hw_version;
+    }
+
+    public void setHw_version(String hw_version) {
+        this.hw_version = hw_version;
+    }
+
+    public String getFw_version() {
+        return fw_version == null ? "" : fw_version;
+    }
+
+    public void setFw_version(String fw_version) {
+        this.fw_version = fw_version;
+    }
+
+    public String getSrc() {
+        return src == null ? "" : src;
+    }
+
+    public void setSrc(String src) {
+        this.src = src;
+    }
+
+    public String getFrom() {
+        return from == null ? "" : from;
+    }
+
+    public void setFrom(String from) {
+        this.from = from;
+    }
+
+    public String getDevice_mac() {
+        return device_mac == null ? "" : device_mac;
+    }
+
+    public void setDevice_mac(String device_mac) {
+        this.device_mac = device_mac;
+    }
+
 
 
     public String getProtocolType() {
@@ -78,4 +136,35 @@
         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;
+
+        public String getImageId() {
+            return imageId == null ? "" : imageId;
+        }
+
+        public void setImageId(String imageId) {
+            this.imageId = imageId;
+        }
+
+        public String getFw_version() {
+            return fw_version == null ? "" : fw_version;
+        }
+
+        public void setFw_version(String fw_version) {
+            this.fw_version = fw_version;
+        }
+
+    }
+
+
 }

--
Gitblit v1.8.0