Merge branch 'dev-lx' into 'dev'

feat: 房源

See merge request !140

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

@@ -26,7 +26,7 @@ public class HouseResource implements Serializable {
 
     private String houseNumber;
 
-    private Integer houseArea;
+    private BigDecimal houseArea;
 
     private String houseResourceAttribute;
 

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

@@ -34,7 +34,7 @@ public class HouseResourceDetail {
 
     private String houseNumber;
 
-    private Integer houseArea;
+    private BigDecimal houseArea;
 
     private int houseResourceAttribute;
 

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

@@ -34,7 +34,7 @@ public class HouseResourcePage {
 
     private String houseNumber;
 
-    private Integer houseArea;
+    private BigDecimal houseArea;
 
     private int houseResourceAttribute;
 

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

@@ -11,7 +11,7 @@
         <result property="projectId" column="project_id" jdbcType="VARCHAR"/>
         <result property="houseResourceUrl" column="house_resource_url" jdbcType="VARCHAR"/>
         <result property="houseNumber" column="house_number" jdbcType="VARCHAR"/>
-        <result property="houseArea" column="house_area" jdbcType="INTEGER"/>
+        <result property="houseArea" column="house_area" jdbcType="DECIMAL"/>
         <result property="houseResourceAttribute" column="house_resource_attribute" jdbcType="INTEGER"/>
         <result property="houseResourceType" column="house_resource_type" jdbcType="INTEGER"/>
         <result property="houseResourceUse" column="house_resource_use" jdbcType="VARCHAR"/>