Merge branch 'dev' into 'main'

Dev

See merge request !149

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

@@ -167,7 +167,8 @@ public class HouseResourceServiceImpl implements HouseResourceService {
             if (StringUtils.hasText(wgName)) {
                 houseResourceProfileGraph.setWgName(wgName);
             }
-            houseResourceProfileGraph.setHouseResources(handleHouseList(v));
+            List<HouseResourcePage> houseResourcePages = handleHouseList(v);
+            houseResourceProfileGraph.setHouseResources(houseResourcePages.stream().sorted(Comparator.comparing(HouseResourcePage::getHouseNumber)).collect(Collectors.toList()));
             resourceProfileGraphList.add(houseResourceProfileGraph);
         });
         return resourceProfileGraphList.stream().sorted(Comparator.comparing(HouseResourceProfileGraph::getId)).collect(Collectors.toList());