Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo

Assets/Scripts/UI/Prefab/Panel/EditUserController.cs

@@ -338,8 +338,12 @@ public class EditUserController : PFUIPanel
             //UIManager.ShowAlert(result.errMsg);
         }
         else
-        {
+        {           
             App.CurrentUser = JObject.FromObject(result.data).ToObject<UserResultModel>();
+            if (App.CurrentUser.Birthday.HasValue) 
+            {
+                App.CurrentUser.Birthday = App.CurrentUser.Birthday.Value.ToLocalTime();
+            }
             var userinfos = UIManager.Instance.userInfos;
             var i = userinfos.FindIndex(x => x.Id == App.CurrentUser.Id);
             if (i != -1)