Merge remote-tracking branch 'origin/master'

linwei

2024-01-24 bdc5d99198b06b9e3fd5e6794d2efea36398b60a

 src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml

@@ -158,6 +158,9 @@
            <if test="house.neiName!=null and house.neiName!=''">
                and br.name like concat('%',#{house.neiName},'%')
            </if>
            <if test="house.address!=null and house.address!=''">
                and jh.address like concat('%',#{house.address},'%')
            </if>
            <if test="house.houseName != null  and house.houseName != ''">and jh.house_name like
                concat('%',#{house.houseName},'%')
            </if>