Merge branch 'dev-lx' into dev

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

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

@@ -77,4 +77,6 @@ public class HouseResource implements Serializable {
     private String lat;
 
     private String remark;
+
+    private Integer showFlag;
 }

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

@@ -37,6 +37,7 @@
         <result property="lon" column="lon" jdbcType="VARCHAR"/>
         <result property="lat" column="lat" jdbcType="VARCHAR"/>
         <result property="remark" column="remark" jdbcType="VARCHAR"/>
+        <result property="showFlag" column="show_flag" jdbcType="INTEGER"/>
     </resultMap>
 
     <insert id="insertHouseResource" parameterType="com.ruoyi.system.domain.house.HouseResource">
@@ -134,7 +135,8 @@
         LEFT JOIN grid_region t2 ON t2.wg_code = t1.four
         LEFT JOIN business_entity_info t3 ON t1.id = t3.house_resource_id
         LEFT JOIN business_entity_sell t4 ON t4.business_entity_info_id = t3.id
-        where t1.rental_unit = 5
+        <where>
+            and t1.show_flag = 1
             <if test="query.wgType != null">
                 and t1.type = #{query.wgType}
             </if>
@@ -168,18 +170,13 @@
             <if test="query.yearSellMin != null and query.yearSellMin != '' and query.yearSellMax != null and query.yearSellMax != ''">
                 and t4.year_sell <![CDATA[ >= ]]> #{query.yearSellMin} and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
             </if>
-        <if test="query.yearTaxMin != null and query.yearTaxMin != '' and query.yearTaxMax != null and query.yearTaxMax != ''">
-            and t4.year_tax <![CDATA[ >= ]]> #{query.yearTaxMin} and t4.year_tax <![CDATA[ <= ]]> #{query.yearTaxMax}
-        </if>
-        <if test="query.unitPriceMin != null and query.unitPriceMin != '' and query.unitPriceMax != null and query.unitPriceMax != ''">
-            and t1.unit_price <![CDATA[ >= ]]> #{query.unitPriceMin} and t1.unit_price <![CDATA[ <= ]]> #{query.unitPriceMax}
-        </if>
             <if test="query.wgCodes != null and query.wgCodes.size() > 0">
                 and t1.two in
                 <foreach item="item" index="index" collection="query.wgCodes" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
+        </where>
         GROUP BY t1.id
         <if test="query.dayPriceMin != null and query.dayPriceMin != '' and query.dayPriceMax != null and query.dayPriceMax != ''">
             having dayPrice <![CDATA[ >= ]]> #{query.dayPriceMin} and dayPrice <![CDATA[ <= ]]> #{query.dayPriceMax}