From 63b0ee228bf52e8e9c4d7fc51a1117543c9a67af Mon Sep 17 00:00:00 2001
From: 刘卫锦 <lwj@hdlchina.com.cn>
Date: 星期一, 03 七月 2023 19:02:40 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP

---
 HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/gateway/HDLLinkLocalGateway.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/gateway/HDLLinkLocalGateway.java b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/gateway/HDLLinkLocalGateway.java
index 7f60a85..8e9d490 100644
--- a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/gateway/HDLLinkLocalGateway.java
+++ b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/gateway/HDLLinkLocalGateway.java
@@ -158,7 +158,8 @@
         }
         for (GatewayBean gatewayBean : this.getGatewayList()) {
             if (macAndSid.equals(gatewayBean.getDevice_mac())
-                    || macAndSid.equals(gatewayBean.getSid())) {
+                    || macAndSid.equals(gatewayBean.getSid())
+                    || macAndSid.equals(gatewayBean.getOid())) {
                 return gatewayBean;
             }
         }

--
Gitblit v1.8.0