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 729bfcd4..7009c05c 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
@@ -1308,17 +1308,17 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setIsCall(orderMaster.getIsCall());
             orderListResponse.setAddress(orderMaster.getAddress());
 
-            orderListResponse.setProvinceId(customerAddress.getProvinceId());
-            orderListResponse.setCityId(customerAddress.getCityId());
-            orderListResponse.setCountryId(customerAddress.getCountryId());
-            orderListResponse.setAddress(customerAddress.getAddress());
-            orderListResponse.setPhone(customerAddress.getPhone());
-            orderListResponse.setName(customerAddress.getName());
-            orderListResponse.setProvinceName(customerAddress.getProvinceName());
-            orderListResponse.setCityName(customerAddress.getCityName());
-            orderListResponse.setCountryName(customerAddress.getCountryName());
-            orderListResponse.setStreetId(customerAddress.getStreetId());
-            orderListResponse.setStreetName(customerAddress.getStreetName());
+            orderListResponse.setProvinceId(orderMaster.getProvinceId());
+            orderListResponse.setCityId(orderMaster.getCityId());
+            orderListResponse.setCountryId(orderMaster.getCountryId());
+            orderListResponse.setAddress(orderMaster.getAddress());
+            orderListResponse.setPhone(orderMaster.getPhone());
+            orderListResponse.setName(orderMaster.getName());
+            orderListResponse.setProvinceName(orderMaster.getProvinceName());
+            orderListResponse.setCityName(orderMaster.getCityName());
+            orderListResponse.setCountryName(orderMaster.getCountryName());
+            orderListResponse.setStreetId(orderMaster.getStreetId());
+            orderListResponse.setStreetName(orderMaster.getStreetName());
 
             return AjaxResult.success(orderListResponse);
         } catch (Exception e) {