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 e5f14a3b..891c48b9 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
@@ -885,6 +885,36 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setAfterServiceRecordList(afterServiceRecords);
             orderListResponse.setServerMoney(master.getServerMoney());
             orderListResponse.setIsCall(master.getIsCall());
+            if (StringUtils.isNotEmpty(master.getProvinceName())){
+                orderListResponse.setProvinceId(master.getProvinceId());
+                orderListResponse.setCityId(master.getCityId());
+                orderListResponse.setCountryId(master.getCountryId());
+                orderListResponse.setPhone(master.getPhone());
+                orderListResponse.setName(master.getName());
+                orderListResponse.setProvinceName(master.getProvinceName());
+                orderListResponse.setCityName(master.getCityName());
+                orderListResponse.setCountryName(master.getCountryName());
+                orderListResponse.setStreetId(master.getStreetId());
+                orderListResponse.setStreetName(master.getStreetName());
+                orderListResponse.setAddress(master.getAddress());
+            }else{
+                if (!StringUtils.isEmpty(customerAddress.getStreetId()+"")){
+                    String addressSysArea=sysArea.getMergerName();
+                    String[] array = addressSysArea.split(",");
+                    orderListResponse.setProvinceName(array[0]);
+                    orderListResponse.setCityName(array[1]);
+                    orderListResponse.setCountryName(array[2]);
+                    orderListResponse.setStreetName(array[3]);
+                }
+                orderListResponse.setProvinceId(customerAddress.getProvinceId());
+                orderListResponse.setCityId(customerAddress.getCityId());
+                orderListResponse.setCountryId(customerAddress.getCountryId());
+                orderListResponse.setStreetId(orderMaster.getStreetId());
+                orderListResponse.setAddress(customerAddress.getAddress());
+                orderListResponse.setPhone(customerAddress.getPhone());
+                orderListResponse.setName(customerAddress.getName());
+
+            }
             orderListResponses.add(orderListResponse);
 
         });