Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Model/Entity/TradePavilion/RB_FirstShop_List.cs

@@ -114,5 +114,10 @@ namespace Mall.Model.Entity.TradePavilion
         /// </summary>
         public DateTime UpdateDate { get; set; }
 
+        /// <summary>
+        /// 同批排序   升序
+        /// </summary>
+        public int Sort { get; set; }
+
     }
 }

Mall.Repository/TradePavilion/RB_FirstShop_ListEnrollRepository.cs

@@ -44,7 +44,7 @@ namespace Mall.Repository.TradePavilion
             }
             if (dmodel.ObjectType > 0)
             {
-                where += $@" and w.{nameof(RB_FirstShop_ListEnroll_Extend.ObjectType)}={dmodel.ObjectType}";
+                where += $@" and w.{nameof(RB_FirstShop_ListEnroll_Extend.ObjectType)}={(int)dmodel.ObjectType}";
             }
             if (dmodel.CandidateState > 0)
             {

Mall.Repository/TradePavilion/RB_FirstShop_ListRepository.cs

@@ -85,7 +85,7 @@ namespace Mall.Repository.TradePavilion
 
             string orderBy = " order by w.Id desc";
             if (dmodel.OrderBy == 1) {
-                orderBy = " order by w.EndDate desc";//根据报名截止日期
+                orderBy = " order by w.EndDate desc,w.Sort asc";//根据报名截止日期
             }
 
             string sql = $@"select w.* from RB_FirstShop_List w