diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/WarehouseInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/WarehouseInfoService.java
index aeee1cd85..03a412217 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/WarehouseInfoService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/WarehouseInfoService.java
@@ -12,5 +12,5 @@ import java.util.List;
  */
 public interface WarehouseInfoService {
 
-    List<WarehouseInfoDO>  getAllAndActive(String keyword);
+    List<WarehouseInfoDO>  getAllAndActive(String keyword,Integer pageNum,Integer pageSize);
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
index 66f3310ec..67ff13067 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
@@ -84,6 +84,7 @@ public class BuildInformationServiceImpl implements BuildInformationService {
             response.setAddresseeMobile(orderSysInfoDO.getAddresseeMobile());
             response.setXgjVicePresident(orderSysInfoDO.getXgjVicePresident());
             response.setXgjRegionId(orderSysInfoDO.getXgjRegionId());
+            response.setXgjRegionName(orderSysInfoDO.getXgjRegionName());
             response.setAddresseeProvince(orderSysInfoDO.getAddresseeProvince());
             response.setAddresseeCity(orderSysInfoDO.getAddresseeCity());
             response.setAddresseeDistrict(orderSysInfoDO.getAddresseeDistrict());
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java
index 57d31bfa3..826ce93fc 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java
@@ -60,6 +60,7 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService {
         OrderSysInfoDO orderSysInfoDO = orderSysInfoDAO.selectByShopId(request.getShopId());
         if (request.getType().equals(OrderSysTypeEnum.ORDER_SYS_TYPE_1.getType())) {
             orderSysInfoDO.setXgjVicePresident(request.getXgjVicePresident());
+            orderSysInfoDO.setXgjRegionName(request.getXgjRegionName());
             orderSysInfoDO.setXgjRegionId(request.getXgjRegionId());
             orderSysInfoDO.setAddresseeProvince(request.getAddresseeProvince());
             orderSysInfoDO.setAddresseeCity(request.getAddresseeCity());
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WarehouseInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WarehouseInfoServiceImpl.java
index 6462427f9..053999ee1 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WarehouseInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WarehouseInfoServiceImpl.java
@@ -3,6 +3,8 @@ package com.cool.store.service.impl;
 import com.cool.store.entity.WarehouseInfoDO;
 import com.cool.store.mapper.WarehouseInfoMapper;
 import com.cool.store.service.WarehouseInfoService;
+import com.github.pagehelper.PageHelper;
+import com.lowagie.text.PageSize;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -21,7 +23,8 @@ public class WarehouseInfoServiceImpl implements WarehouseInfoService {
     @Resource
     private WarehouseInfoMapper warehouseInfoMapper;
     @Override
-    public List<WarehouseInfoDO> getAllAndActive(String keyword) {
+    public List<WarehouseInfoDO> getAllAndActive(String keyword,Integer pageNum,Integer pageSize) {
+        PageHelper.startPage(pageNum,pageSize);
         return  warehouseInfoMapper.getAllAndActive(keyword);
     }
 }
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCWarehouseInfoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCWarehouseInfoController.java
index 67bca1453..a009be68d 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCWarehouseInfoController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCWarehouseInfoController.java
@@ -29,7 +29,9 @@ public class PCWarehouseInfoController {
 
     @GetMapping("/getAllAndActive")
     @ApiOperation(value = "获取正新鸡排仓库配置")
-    public ResponseResult<List<WarehouseInfoDO>> getAllAndActive(@RequestParam("keyword")String keyword ) {
-        return ResponseResult.success(warehouseInfoService.getAllAndActive(keyword));
+    public ResponseResult<List<WarehouseInfoDO>> getAllAndActive(@RequestParam("keyword")String keyword ,
+                                                                 @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
+                                                                 @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize) {
+        return ResponseResult.success(warehouseInfoService.getAllAndActive(keyword,pageNum,pageSize));
     }
 }