Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -146,11 +146,11 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Override
     public ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
         Page<TaBuilding> page = new Page<>();
-        page.setSize(pageSize == null ? 10 : pageSize);
-        page.setCurrent(pageNum == null ? 1 : pageNum);
+//        page.setSize(pageSize == null ? 10 : pageSize);
+//        page.setCurrent(pageNum == null ? 1 : pageNum);
         List<TaBuilding> building = taBuildingMapper.buildingListSelect(page, name, code, startDate, buildingStatus, marketStatus, cityId, isMain, orgId, taPersonBuildingList);
-        page.setRecords(building);
-        return ResponseBean.success(page);
+//        page.setRecords(building);
+        return ResponseBean.success(building);
     }
 
     /**