diff --git a/src/main/java/com/glxp/api/controller/inventory/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/inventory/InvWarehouseController.java
index fc7e8d5e..4cd90183 100644
--- a/src/main/java/com/glxp/api/controller/inventory/InvWarehouseController.java
+++ b/src/main/java/com/glxp/api/controller/inventory/InvWarehouseController.java
@@ -76,10 +76,12 @@ public class InvWarehouseController {
     @GetMapping("spms/inv/warehouse/filter")
     public BaseResponse filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) {
         List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest);
-        List<InvWarehouseResponse> merge = merge(invWarehouseEntities, 0);
-        Map<String, Object> restMap = new HashMap<>();
-        restMap.put("list", merge);
-        return ResultVOUtils.success(restMap);
+        PageInfo<InvWarehouseEntity> pageInfo = new PageInfo<>(invWarehouseEntities);
+        PageSimpleResponse<InvWarehouseEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(invWarehouseEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+
     }
 
     @AuthRuleAnnotation("")
@@ -185,19 +187,19 @@ public class InvWarehouseController {
     }
 
 
-    public List<InvWarehouseResponse> merge(List<InvWarehouseEntity> invWarehouseEntities,
-                                            Integer pid) {
-        List<InvWarehouseResponse> invWarehouseResponses = new ArrayList<>();
-        for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) {
-            InvWarehouseResponse invWarehouseResponse = new InvWarehouseResponse();
-            BeanUtils.copyProperties(invWarehouseEntity, invWarehouseResponse);
-            if (pid.equals(invWarehouseEntity.getPid())) {
-                invWarehouseResponse.setChildren(merge(invWarehouseEntities, invWarehouseEntity.getId()));
-                invWarehouseResponses.add(invWarehouseResponse);
-            }
-        }
-        return invWarehouseResponses;
-    }
+//    public List<InvWarehouseResponse> merge(List<InvWarehouseEntity> invWarehouseEntities,
+//                                            Integer pid) {
+//        List<InvWarehouseResponse> invWarehouseResponses = new ArrayList<>();
+//        for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) {
+//            InvWarehouseResponse invWarehouseResponse = new InvWarehouseResponse();
+//            BeanUtils.copyProperties(invWarehouseEntity, invWarehouseResponse);
+//            if (pid.equals(invWarehouseEntity.getPid())) {
+//                invWarehouseResponse.setChildren(merge(invWarehouseEntities, invWarehouseEntity.getId()));
+//                invWarehouseResponses.add(invWarehouseResponse);
+//            }
+//        }
+//        return invWarehouseResponses;
+//    }
 
     @AuthRuleAnnotation("")
     @PostMapping("/spms/inv/warehouse/save1")