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/CloudInverterDeviceBean.java |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java
index d1a5959..373f4f7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java
@@ -33,7 +33,7 @@
     private String systemStatusDesc;//鐘舵��
 
     private String inv;//inv鐘舵��
-    private int deviceStatus;//1:寰呮満,2:杩炴帴涓�,3:鏁呴殰,4:杩愯,5:绂荤嚎
+    private int deviceStatus;// 锛� 杩炴帴涓紝2 锛� 鏁呴殰锛�3 锛� 杩愯锛�4 锛� 绂荤嚎
     private String addresses;//瀛愮綉鍙�/璁惧鍙�
     private List<DeviceAttributeBean> status;
 
@@ -47,6 +47,18 @@
     private String outputActivePower;//閫嗗彉鍣ㄨ緭鍑烘湁鍔熷姛鐜�
     private String address;//璇︾粏鍦板潃
     private HouseInfoBean.Location location;//鐢电珯鍦板潃
+    private String localSecret;//鎵�灞炵數绔欑殑鏈湴瀵嗛挜
+
+    private boolean ogMaster;//绂荤綉閫嗗彉鍣ㄦ墠杩斿洖
+
+    public boolean isOgMaster() {
+        return ogMaster;
+    }
+
+    public void setOgMaster(boolean ogMaster) {
+        this.ogMaster = ogMaster;
+    }
+
 
     public String getSystemStatusDesc() {
         return systemStatusDesc == null ? "" : systemStatusDesc;
@@ -250,6 +262,13 @@
         this.location = location;
     }
 
+    public String getLocalSecret() {
+        return localSecret == null ? "" : this.localSecret;
+    }
+
+    public void setLocalSecret(String localSecret) {
+        this.localSecret = localSecret;
+    }
 
     /**
      * 鎷间綇瀹呭湴鍧�

--
Gitblit v1.8.0