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

Assets/Scripts/Apis/Models/MapCompetition.cs

@@ -13,7 +13,7 @@ namespace Assets.Scripts.Apis.Models
         public string CreateTime { get; set; }
         public int CreateUser { get; set; }
         public string Dec { get; set; }
-        public string EndApplyTime { get; set; }
+        public DateTime EndApplyTime { get; set; }
         public string EndApplyTimeVlaue { get; set; }
 
         public bool IsOfficial { get; set; }