From 6f97a42dccaedb7a8950feac205080e63d8be439 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 26 二月 2025 14:27:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml b/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml
index d09143d..a4bb3e9 100644
--- a/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml
+++ b/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
--
Gitblit v1.7.1