Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

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

@@ -90,6 +90,11 @@
        /// 成员请求控制主帐号此住宅时请求基地址的LoginAccessToken的值

        /// </summary>
        public string AdminRequestToken = string.Empty;
        /// <summary>

        /// 远程连接的Mqtt的客户端ID

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

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