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

# Conflicts:
#	Assets/Scripts/Apis/Models/MapCompetition.cs
#	Assets/Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs

Assets/Scripts/Apis/Models/MapCompetition.cs

@@ -69,6 +69,8 @@ namespace Assets.Scripts.Apis.Models
         public string ShortPreview { get; set; }
         //活动banner
         public string BannerPreview { get; set; }
+        public bool HasJoin { get; set; }
+        public int ApplyCount { get; set; }
 
     }
     public class CompetitionPlayer