Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-13 99da2604f81af29afc6b3c6f4f128b4e5a8a5649

 ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs

@@ -100,7 +100,12 @@
        /// 远程连接的Mqtt的客户端ID

        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public string ConnEmqClientId = string.Empty;
        public string ConnEmqClientId = string.Empty;

        /// <summary>

        /// 当前登录的账号是不是之前的账号

        /// </summary>

        [Newtonsoft.Json.JsonIgnore]

        public bool TheSameLoginAccount = false;

        [Newtonsoft.Json.JsonIgnore]
        /// <summary>