From d60b92c58ac09197642eb6dac9b905f0898dacb8 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期三, 09 十二月 2020 15:42:13 +0800 Subject: [PATCH] Merge branch 'CJL-NEW' --- HDL_ON/Entity/DB_ResidenceData.cs | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs index f11328a..a6e4901 100644 --- a/HDL_ON/Entity/DB_ResidenceData.cs +++ b/HDL_ON/Entity/DB_ResidenceData.cs @@ -157,6 +157,7 @@ Rooms = null; ins_OidList = null; functionList = null; + HomeGateway = null; if (MainPage.IsRemote) { DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�"); @@ -269,10 +270,11 @@ #region 鍔熻兘鏁版嵁 static FunctionList _functionList; - public static FunctionList functionList { + public static FunctionList functionList + { get { - if(_functionList == null) + if (_functionList == null) { _functionList = FunctionList.List; } -- Gitblit v1.8.0