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

# Conflicts:
#	Assets/Scripts/Apis/UserApi.cs
#	Assets/Scripts/App.cs
#	Assets/Scripts/ConfigHelper.cs
#	Assets/Scripts/Scenes/LoginController.cs
#	Assets/Scripts/UI/Prefab/Panel/HomeController.cs

Assets/Scripts/Apis/Models/UserModel.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.Scripts.Apis.Models
+{
+    public class UserModel
+    {
+        public string NickName { get; set; }
+        public int Ftp { get; set; }
+        public double Weight { get; set; }
+        public double BicycleWeight { get; set; }
+        public string Carlories { get; set; }
+        public string Avatar { get; set; }
+        public double Distance { get; set; }
+        public string Climb { get; set; }
+    }
+}

Assets/Scripts/Apis/Models/UserModel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 359b7bb30d2d48245821f1b6a86d4811
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Apis/Models/UserResultModel.cs

@@ -56,5 +56,12 @@ namespace Assets.Scripts.Apis.Models
         /// 已连接到Strava
         /// </summary>
         public bool ConnectedToStrava { get; set; }
+
+        public DateTime? Birthday { get; set; }
+        //cookie
+        public string cookie { get; set; }
+
+
+
     }
 }