From 2109463fab2eb1caed189e4f258e0e763c5cea7b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 11:58:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index da3d02d..5004d73 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/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>

--
Gitblit v1.8.0