diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
index b07db3c3..d1044f14 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
@@ -235,8 +235,8 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setDiscountMoney(financialMaster.getDiscountMoney());
             orderListResponse.setTotalMoney(financialMaster.getTotalMoney());
             orderListResponse.setPayMoney(financialMaster.getPayMoney());
-            orderListResponse.setWorkerName(worker.getName());
-            orderListResponse.setWorkerPhone(worker.getPhone());
+            orderListResponse.setWorkerName(worker == null ? "" : worker.getName());
+            orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
             orderListResponse.setCustomerName(customer.getName());
             orderListResponse.setCustomerPhone(customer.getPhone());
             orderListResponse.setOrderStatus(orderMaster.getOrderStatus());
@@ -248,6 +248,7 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setExpectTimeStart(orderMaster.getExpectTimeStart());
             orderListResponse.setExpectTimeEnd(orderMaster.getExpectTimeEnd());
             orderListResponse.setCreateTime(orderMaster.getCreateTime());
+            orderListResponse.setRemark(orderMaster.getRemark());
             orderListResponse.setOrderStandardDetailList(orderStandardDetails);
 
             return AjaxResult.success(orderListResponse);
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 1fb2fdf1..880b8e83 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
@@ -57,6 +57,8 @@ public class OrderListResponse {
 
     private Date createTime;
 
+    private String remark;
+
     private List<OrderStandard> standardList;
 
     private List<OrderStandardDetail> orderStandardDetailList;