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 55c47b51..2cbd81de 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
@@ -2169,10 +2169,10 @@ public class OrderController extends BaseController {
             }
 
             // 售后记录
-            // AfterServiceRecord afterServiceRecord = new AfterServiceRecord();
-            // afterServiceRecord.setOrderDetailId(detail.getId());
-            // List<AfterServiceRecord> afterServiceRecordList
-            // =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord);
+            AfterServiceRecord afterServiceRecord = new AfterServiceRecord();
+            afterServiceRecord.setOrderDetailId(detail.getId());
+            List<AfterServiceRecord> afterServiceRecordList
+            =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord);
 
             // 编辑返回属性
             orderListResponse.setWorkerRemark(detail.getWorkerRemark());
@@ -2257,7 +2257,7 @@ public class OrderController extends BaseController {
                     orderListResponse.setInsuranceManager(manager);
                 }
             }
-            // orderListResponse.setAfterServiceRecordList(afterServiceRecordList);
+             orderListResponse.setAfterServiceRecordList(afterServiceRecordList);
             orderListResponses.add(orderListResponse);
         }
         return orderListResponses;
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 cf76e124..f212d909 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
@@ -1900,7 +1900,7 @@ public class OrderMasterController extends BaseController {
                     workerRealInfo=goodsWorkerRealInfo;
                 }
                 masterCompanyName = workerRealInfo == null ? null : workerRealInfo.getCompanyName();
-                masterCompanyPhone=workerRealInfo == null ? null : workerRealInfo.getLegalPersionPhoneNum();
+                masterCompanyPhone=goodsWorker.getPhone();
                
             }
             // 商品信息