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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

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

old mode 100755
new mode 100644
@@ -173,7 +173,10 @@
                return (DateTime.Now - LoginDateTime).Days < 7;
            }
        }

        /// <summary>
        ///暂时默认
        /// </summary>
        public string UserName = string.Empty;
        /// <summary>
        /// 账户登录成功的账户类型
        /// </summary>
@@ -195,7 +198,6 @@
            }
        }
        
        public string Name = string.Empty;
        /// <summary>
        /// 当前登录的帐号
        /// </summary>