Merge remote-tracking branch 'origin/master'

xuhy

2025-02-17 fa530d76285c1e65cb3e98fe536f12dd46a852d7

Merge remote-tracking branch 'origin/master'

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

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

@@ -58,7 +58,8 @@
            t2.id as tenantId,
            t2.id_card as idCard,
            t2.bank_number as bankNumber,
            t2.mail_address as mailAddress
            t2.mail_address as mailAddress,
            t2.tenant_attributes as tenantAttributes,
        from t_contract t1
        left join t_tenant t2 on t1.tenant_id = t2.id
        LEFT JOIN t_house t3 on t3.id = t1.house_id