Merge remote-tracking branch 'origin/master'

xuhy

2025-03-06 cf487c08709996416e4f04b6d144ac65a46f8904

 ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml

@@ -38,7 +38,7 @@
            <if test="req.propertyRightPerson != null and req.propertyRightPerson != ''">
                and t1.property_right_person like concat('%', #{req.propertyRightPerson}, '%')
            </if>
            <if test="req.leaseStatus != null">
            <if test="req.leaseStatus != null and req.houseName != ''">
                and t1.lease_status = #{req.leaseStatus}
            </if>
            AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}