From a4924de3136289d10cabbf2f61a228387d44ded7 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 07 十一月 2019 13:48:36 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index 24756d1..c3c50c7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing Shared.Common;
+using System;
using System.Collections.Generic;
namespace Shared.Phone.UserCenter
@@ -59,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