Merge branch 'master' of http://git.fwt.com/Hotline/hotline

src/Hotline.Share/Dtos/Settings/TimeLimitDto.cs

@@ -60,6 +60,10 @@ namespace Hotline.Share.Dtos.Settings
         /// </summary>
         public List<CombinationParamModel> CombinationParam { get; set; }
 
+        /// <summary>
+        /// 组合参数拼接
+        /// </summary>
+        public string CombinationDisplayParam { get; set; }
 
         /// <summary>
         /// 时限