From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
index 2216ec9..7a256a9 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
@@ -120,6 +120,11 @@
}
/// <summary>
+ /// 鐧诲綍鏃禩oken
+ /// </summary>
+ public string LoginToken = string.Empty;
+
+ /// <summary>
/// 鐧诲綍杩囩殑甯愬彿淇℃伅
/// </summary>
public List<string> AccountList = new List<string> { };
@@ -127,7 +132,7 @@
public List<string> HomeFilePathList = new List<string> { };
public string HomeId = string.Empty;
-
+
[Newtonsoft.Json.JsonIgnore]
private House m_Home = null;
/// <summary>
--
Gitblit v1.8.0