diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
index 7f08543f..ca18dfdd 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
@@ -140,7 +140,6 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setWorkerPhone(worker.getPhone());
             orderListResponse.setCustomerName(customer.getName());
             orderListResponse.setCustomerPhone(customer.getPhone());
-            orderListResponse.setServerTime(detail.getWorkBeginTime());
             orderListResponse.setOrderStatus(detail.getOrderStatus());
             orderListResponse.setPayStatus(orderMaster.getPayStatus());
             orderListResponse.setPayType(orderMaster.getPayType());
@@ -148,6 +147,8 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setAddress(customerAddress.getAddress());
             orderListResponse.setServerTime(detail.getRevTime());
             orderListResponse.setCreateTime(detail.getCreateTime());
+            orderListResponse.setWorkBeginTime(detail.getWorkBeginTime());
+            orderListResponse.setWorkFinishTime(detail.getWorkFinishTime());
 
             return AjaxResult.success(orderListResponse);
         }catch (Exception e){
@@ -216,15 +217,15 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setWorkerPhone(worker.getPhone());
             orderListResponse.setCustomerName(customer.getName());
             orderListResponse.setCustomerPhone(customer.getPhone());
-            orderListResponse.setServerTime(detail.getWorkBeginTime());
             orderListResponse.setOrderStatus(detail.getOrderStatus());
             orderListResponse.setPayStatus(orderMaster.getPayStatus());
             orderListResponse.setPayType(orderMaster.getPayType());
             orderListResponse.setStandardList(standardList);
             orderListResponse.setAddress(customerAddress.getAddress());
             orderListResponse.setServerTime(detail.getRevTime());
+            orderListResponse.setWorkBeginTime(detail.getWorkBeginTime());
+            orderListResponse.setWorkFinishTime(detail.getWorkFinishTime());
             orderListResponses.add(orderListResponse);
-
         });
         return voDataTable(orderListResponses, list);
     }
diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
index 2c0d781f..7d95cf42 100644
--- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
+++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
@@ -28,6 +28,10 @@ public class OrderListResponse {
 
     private Date serverTime;
 
+    private Date workBeginTime;
+
+    private Date workFinishTime;
+
     private String goodsName;
 
     private Integer orderStatus;