diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index 79388fd0..66ab0b7f 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -253,7 +253,7 @@ public class OrderController extends BaseController {
                     goodsStandard.getGoodsStandardName(), goodsStandard.getGoodsNum(), 0);
             orderGoodsService.insertOrderGoods(orderGoods);
         });
-        
+
         return AjaxResult.success("下单成功");
     }
 
@@ -785,7 +785,7 @@ public class OrderController extends BaseController {
     }
 
     /**
-     * 查询主单子单的混合列表，根据预约时间倒序排列，请求参数中的师傅id不能为空
+     * 查询主单子单的混合列表
      */
     @PostMapping("/app/mix/order/list")
     @ResponseBody
@@ -830,11 +830,15 @@ public class OrderController extends BaseController {
             orderListResponses.addAll(masterList);
         }
 
-        // 根据预约时间倒序排列
+        // 查询新订单列表根据创建时间倒叙排列，查询其他根据更新时间倒序排列
         Collections.sort(orderListResponses, new Comparator<OrderListResponse>() {
             @Override
             public int compare(OrderListResponse o1, OrderListResponse o2) {
-                return o1.getExpectTimeStart().compareTo(o2.getExpectTimeStart());
+                if (Objects.equals(orderListRequest.getOrderStatus(), 0) || Objects.equals(orderListRequest.getTimeout(), 1)) {
+                    return o2.getCreateTime().compareTo(o1.getCreateTime());
+                } else {
+                    return o2.getUpdateTime().compareTo(o1.getUpdateTime());
+                }
             }
         });
 
@@ -879,11 +883,11 @@ public class OrderController extends BaseController {
         }
         orderListResponses.addAll(filteredMasterList);
 
-        // 根据预约时间倒序排列
+        // 根据更新时间倒序排列
         Collections.sort(orderListResponses, new Comparator<OrderListResponse>() {
             @Override
             public int compare(OrderListResponse o1, OrderListResponse o2) {
-                return o1.getExpectTimeStart().compareTo(o2.getExpectTimeStart());
+                return o2.getUpdateTime().compareTo(o1.getUpdateTime());
             }
         });
 
@@ -1014,6 +1018,8 @@ public class OrderController extends BaseController {
             orderListResponse.setTimeout(master.getTimeout());
             orderListResponse.setTimeoutFineTimes(master.getTimeoutFineTimes());
             orderListResponse.setAfterServiceRecordList(afterServiceRecords);
+            orderListResponse.setCreateTime(master.getCreateTime());
+            orderListResponse.setUpdateTime(master.getUpdateTime());
             orderListResponses.add(orderListResponse);
 
         });
@@ -1142,6 +1148,8 @@ public class OrderController extends BaseController {
             orderListResponse.setChangeMoney(changeMoney);
             orderListResponse.setDrawCashStatus(detail.getDrawCashStatus());
             orderListResponse.setDrawCashTime(detail.getDrawCashTime());
+            orderListResponse.setCreateTime(detail.getCreateTime());
+            orderListResponse.setUpdateTime(detail.getUpdateTime());
             orderListResponses.add(orderListResponse);
         });
         return orderListResponses;
@@ -1238,6 +1246,8 @@ public class OrderController extends BaseController {
             orderListResponse.setChangeMoney(changeMoney);
             orderListResponse.setServerMoney(financialMaster.getServerMoney());
             orderListResponse.setAfterServiceRecordList(afterServiceRecords);
+            orderListResponse.setCreateTime(master.getCreateTime());
+            orderListResponse.setUpdateTime(master.getUpdateTime());
             orderListResponses.add(orderListResponse);
 
         }
@@ -1328,6 +1338,8 @@ public class OrderController extends BaseController {
             orderListResponse.setTimeout(detail.getTimeout());
             orderListResponse.setTimeoutFineTimes(detail.getTimeoutFineTimes());
             orderListResponse.setChangeMoney(changeMoney);
+            orderListResponse.setCreateTime(detail.getCreateTime());
+            orderListResponse.setUpdateTime(detail.getUpdateTime());
 //            orderListResponse.setAfterServiceRecordList(afterServiceRecordList);
             orderListResponses.add(orderListResponse);
         }