Merge branch 'dev-lx' into 'dev'

feat: 房源

See merge request !132

ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceServiceImpl.java

@@ -165,7 +165,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
             houseResourceProfileGraph.setId(k);
             GridRegion gridRegion = gridRegionMapper.selectByPrimaryKey(k);
             houseResourceProfileGraph.setWgName(gridRegion.getWgName());
-            houseResourceProfileGraph.setHouseResources(v);
+            houseResourceProfileGraph.setHouseResources(handleHouseList(v));
             resourceProfileGraphList.add(houseResourceProfileGraph);
         });
         return resourceProfileGraphList;