Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

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

@@ -194,7 +194,8 @@
                config = new Config { };
            }
        }

        
        public string Name = string.Empty;
        /// <summary>
        /// 当前登录的帐号
        /// </summary>
@@ -281,7 +282,7 @@
        public List<string> HomeFilePathList = new List<string> { };

        public string HomeId = string.Empty;

 


        [Newtonsoft.Json.JsonIgnore]
        private House m_Home = null;
        /// <summary>