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

# Conflicts:
#	Assets/Scripts/Apis/Models/MapCompetition.cs

Assets/Scripts/Apis/Models/MapCompetition.cs

@@ -32,7 +32,7 @@ namespace Assets.Scripts.Apis.Models
         //public string EndTimeVlaue { get; set; }
 
         public int Status { get; set; }
-        public object StatusVlaue { get; set; }
+        public string StatusVlaue { get; set; }
         public string Title { get; set; }
         public double TotalDistance { get; set; }
         public bool applyed { get; set; }
@@ -58,6 +58,13 @@ namespace Assets.Scripts.Apis.Models
         public int MaxMembers { get; set; }
         //报名参赛的选手
         public List<CompetitionPlayer> UserList  {get;set; }
+        public double Distance { get; set; }
+        public double AverageGrade { get; set; }
+        public double EleDifference { get; set; }
+        public double? TotalClimb { get; set; }
+        public double MaxElevation { get; set; }
+        public string AltitudeGraph { get; set; }
+        public string RouteCover { get; set; }
         //简版赛事详情
         public string ShortPreview { get; set; }
         //活动banner