From c885f99c9ff1445f6975d16faf4a23006cd5763b Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 05 二月 2025 14:53:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun

---
 ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml
index ec45f48..4e23099 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml
@@ -30,7 +30,7 @@
     </sql>
     <select id="pageList" resultType="com.ruoyi.system.vo.TenantVO">
         SELECT id, resident_name, checkIn_time, tenant_attributes, tenant_type, phone, id_card, email,
-        bank_number, mail_address, create_time, disabled,account,
+        bank_number, mail_address, create_time, disabled,account
         FROM t_tenant
         <where>
             <if test="query.residentName != null and query.residentName != ''">

--
Gitblit v1.7.1