Merge remote-tracking branch 'origin/master'

linwei

2024-01-03 c4fb77c78f0617abdf117ca135dfee519f0bca51

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

@@ -238,6 +238,7 @@
        left join jczz_user_house_label jhl on jh.id = jhl.household_id
        where 1=1 and jh.is_deleted = 0
        and jh.house_code = #{code}
        order by jh.relationship asc,jh.id desc
    </select>

    <!--查询房屋集合信息-按id-->