Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/Bi/BiCallController.cs

@@ -496,9 +496,10 @@ public class BiCallController : BaseController
                 RestDuration = SqlFunc.AggregateSum(x.RestDuration / 60) / SqlFunc.AggregateCount(x.Id),
                 CumulativeDuration = SqlFunc.AggregateSum(x.RestDuration / 60)
             })
+            .OrderByDescending(x=>x.DayTime)
             .OrderByIF(dto.SortRule is 0, a => a.RestDuration, OrderByType.Asc)
             .OrderByIF(dto.SortRule is 1, a => a.RestDuration, OrderByType.Desc)
-            .MergeTable()
+            //.MergeTable()
             .ToListAsync(HttpContext.RequestAborted);
     }
 
@@ -527,9 +528,10 @@ public class BiCallController : BaseController
                 RestDuration = SqlFunc.AggregateSum(x.RestDuration / 60) / SqlFunc.AggregateCount(x.Id),
                 CumulativeDuration = SqlFunc.AggregateSum(x.RestDuration / 60)
             })
+             .OrderByDescending(x => x.DayTime)
             .OrderByIF(dto.QueryDto.SortRule is 0, a => a.RestDuration, OrderByType.Asc)
             .OrderByIF(dto.QueryDto.SortRule is 1, a => a.RestDuration, OrderByType.Desc)
-            .MergeTable()
+           // .MergeTable()
             .ToListAsync(HttpContext.RequestAborted);
 
         dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<BiSeatRestDto>(dto.ColumnInfos);