Merge branch 'dev' into 'main'

Dev

See merge request !33

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/HouseResourcePage.java

@@ -18,6 +18,8 @@ public class HouseResourcePage {
 
     private String four;
 
+    private String wgName;
+
     private int type;
 
     private String projectId;

ruoyi-system/src/main/resources/mapper/house/HouseResourceMapper.xml

@@ -105,7 +105,7 @@
     </insert>
 
     <select id="selectPage" resultType="com.ruoyi.system.domain.house.vo.HouseResourcePage">
-        select * from house_resource
+        SELECT t1.*, t2.wg_name AS wgName FROM house_resource t1 LEFT JOIN grid_region t2 ON t1.four = t2.id
         <where>
             <if test="query.two != null and query.two != ''">
                 and two like concat('%', #{query.two}, '%')