Merge branch 'ww'

src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java

@@ -36,12 +36,12 @@ public class ThrInvWarehouseController {
 
     @GetMapping("/thirdSys/sub/inv/warehouse/filter")
     public BaseResponse filterInvWarehouse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest) {
-        List<ThrInvWarehouseResponse> ThrInvWarehouseResponses = thrInvWarehouseService.filterThrInvWarehouseResponse(filterThrSubInvWarehouseRequest);
-        PageInfo<ThrInvWarehouseResponse> pageInfo;
-        pageInfo = new PageInfo<>(ThrInvWarehouseResponses);
-        PageSimpleResponse<ThrInvWarehouseResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.filterThrInvWarehouse(filterThrSubInvWarehouseRequest);
+        PageInfo<ThrInvWarehouseEntity> pageInfo;
+        pageInfo = new PageInfo<>(thrInvWarehouseEntities);
+        PageSimpleResponse<ThrInvWarehouseEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
-        pageSimpleResponse.setList(ThrInvWarehouseResponses);
+        pageSimpleResponse.setList(thrInvWarehouseEntities);
         return ResultVOUtils.success(pageSimpleResponse);
     }