From eb5a57942bae8eb57fd7fb61124c247bebb67e8e Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 19 六月 2020 10:18:28 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm

---
 Home0618/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/Home0618/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/Home0618/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index aba0955..5f22780 100755
--- a/Home0618/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/Home0618/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -294,6 +294,14 @@
         /// 浜戠杩滅▼鍦ㄧ嚎鐘舵��
         /// </summary>
         public bool MqttOnlineStatus = false;
+        /// <summary>
+        /// 涓庢缃戝叧鍦ㄤ簯绔疎mq閫氫俊鏃讹紝璐熻浇鍔犺В鐨�16浣岮es瀵嗛挜
+        /// </summary>
+        public string AesKey;
+        /// <summary>
+        /// 缃戝叧瀵瑰簲鐨勫敮涓�鐮�
+        /// </summary>
+        public string MacMark;
     }
 
     /// <summary>

--
Gitblit v1.8.0