From fb7bd4da57428b5f16b4f90729fe8f497585d327 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 19 八月 2025 11:04:30 +0800
Subject: [PATCH] 合并0819

---
 java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
index af74591..c48f0b2 100755
--- a/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
@@ -125,7 +125,7 @@
         t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,
         t.owner_type_cd ownerTypeCd,t.create_time createTime,t.community_id,
         t.community_id communityId,t.id_card, t.id_card idCard,t.state,td.name ownerTypeName,
-        t.owner_flag,t.owner_flag ownerFlag,t.address,t.person_type personType,t.person_role personRole,
+        t.owner_flag,t.owner_flag ownerFlag,t.address,t.other_address otherAddress,t.person_type personType,t.person_role personRole,
         t.concact_person concactPerson, t.concact_link concactLink,t.face_url faceUrl,td.name ownerTypeName,
         tdType.name personTypeName,tdRole.name personRoleName
         <if test="roomIds != null">
@@ -506,7 +506,7 @@
         select t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,t.remark,t.owner_id,t.owner_id ownerId,t.b_id,t.b_id
         bId,t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,
         t.owner_type_cd,t.owner_type_cd ownerTypeCd,t.community_id,
-        t.community_id communityId,t.id_card, t.id_card idCard,t.address
+        t.community_id communityId,t.id_card, t.id_card idCard,t.address,t.other_address otherAddress
         FROM building_owner t
         WHERE
         t.`status_cd` = '0'
@@ -589,7 +589,7 @@
         bId,t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,t.owner_type_cd
         ownerTypeCd,
         r.`room_id` roomId,r.`room_num` roomNum,t.community_id,t.community_id communityId,t.id_card, t.id_card
-        idCard,orr.start_time startTime ,orr.end_time endTime,t.address
+        idCard,orr.start_time startTime ,orr.end_time endTime,t.address,t.other_address otherAddress
         FROM building_room r,building_owner_room_rel orr,building_owner t
         WHERE r.`room_id` = orr.`room_id`
         AND orr.`owner_id` = t.`owner_id`
@@ -614,7 +614,7 @@
     <!-- 鏍规嵁鍋滆溅浣嶆煡璇� -->
     <select id="queryOwnersByParkingSpace" parameterType="Map" resultType="Map">
         select ps.num,ps.ps_id psId,t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,t.remark,t.owner_id,t.owner_id
-        ownerId,t.b_id,t.b_id bId,t.address,
+        ownerId,t.b_id,t.b_id bId,t.address,t.other_address otherAddress,
         t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,
         t.owner_type_cd,t.owner_type_cd ownerTypeCd,t.id_card, t.id_card idCard
         from p_parking_space ps , owner_car oc,building_owner t

--
Gitblit v1.8.0