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

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs

@@ -60,7 +60,17 @@
        /// <summary>

        /// 用户图标文件

        /// </summary>

        [Newtonsoft.Json.JsonIgnore]

        public string UserIconFile = string.Empty;

        /// <summary>

        /// 用户图标文件是否改变

        /// </summary>

        [Newtonsoft.Json.JsonIgnore]

        public bool UserIconFileChanged = false;

        /// <summary>

        /// 用户头像数据

        /// </summary>

        public byte[] HeadImage = null;

    }



    /// <summary>