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

# Conflicts:
#	Assets/Resources/Images/back.png.meta
#	Assets/Resources/Images/change account.png.meta
#	Assets/Scripts/UI/Prefab/Panel/EditUserController.cs

Assets/Scripts/Apis/Models/NearRouteModel.cs

@@ -25,5 +25,13 @@ namespace Assets.Scripts.Apis.Models
         /// 骑行热度
         /// </summary>
         public int TheHeat { get; set; }
+
+        public string Hard { get; set; }
+        public bool IsFire { get; set; }
+        public string CountryCode { get; set; }
+
+        public bool IsFavorite { get; set; }
+
+        public bool Enable3D { get; set; }
     }
 }