Merge branch 'dev' into 'main'

Dev

See merge request !145

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/HouseResource.java

@@ -28,9 +28,9 @@ public class HouseResource implements Serializable {
 
     private BigDecimal houseArea;
 
-    private String houseResourceAttribute;
+    private int houseResourceAttribute;
 
-    private String houseResourceType;
+    private int houseResourceType;
 
     private String houseResourceUse;
 

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

@@ -170,7 +170,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
             houseResourceProfileGraph.setHouseResources(handleHouseList(v));
             resourceProfileGraphList.add(houseResourceProfileGraph);
         });
-        return resourceProfileGraphList;
+        return resourceProfileGraphList.stream().sorted(Comparator.comparing(HouseResourceProfileGraph::getId)).collect(Collectors.toList());
     }
 
     @Override