Merge remote-tracking branch 'origin/master' into xizang-changyun

yupeng

2025-02-26 6f97a42dccaedb7a8950feac205080e63d8be439

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

@@ -55,9 +55,11 @@
            t3.room_number as roomNumber,
            t3.house_area as houseArea,
            t2.phone as loginAccount,
            t2.id as tenantId,
            t2.id_card as idCard,
            t2.bank_number as bankNumber,
            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