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

src/Hotline.Application/Orders/OrderApplication.cs

@@ -340,7 +340,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             //.Where(d => d.ExpiredTime != null &&
             //         d.Status != EOrderStatus.Filed && d.Status != EOrderStatus.Published && d.Status != EOrderStatus.Visited && stTime >= d.ExpiredTime.Value && stTime2 <= d.ExpiredTime.Value)
             .Where(d => d.Status < EOrderStatus.Filed && dateTime > d.NearlyExpiredTime && dateTime < d.ExpiredTime)
-            .OrderByDescending(d => d.CreationTime);
+            .OrderBy(d => d.NearlyExpiredTime);
     }
 
     // /// <summary>
@@ -403,7 +403,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                           d.FiledTime >= d.ExpiredTime) ||
                          ((d.Status != EOrderStatus.Filed && d.Status != EOrderStatus.Published && d.Status != EOrderStatus.Visited) &&
                           stTime >= d.ExpiredTime.Value)))
-            .OrderByDescending(x => x.CreationTime);
+            .OrderBy(x => x.ExpiredTime);
     }
 
     //     /// <summary>