From 7ac22906f7f12b335bdf8be8f3cb64eb5152db93 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 31 Mar 2023 15:16:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E6=90=9C=E7=B4=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataBoard/renfang/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue
index 8e5268e6f..0d5552b4c 100644
--- a/src/views/dataBoard/renfang/index.vue
+++ b/src/views/dataBoard/renfang/index.vue
@@ -672,11 +672,12 @@ export default {
 						title =
 							item.building + "-" + item.unit + "-" + item.door;
 					}
+					console.log('==========detailJson', detailJson);
 					return {
 						title,
 						type,
-						...detailJson,
 						...item,
+						...detailJson,
 					};
 				});
 			} else {

From 9c58575c7cfc19749887963baa42a8cf2e511885 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Fri, 31 Mar 2023 15:18:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E5=8C=BA?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E6=A5=BC=E6=A0=8B=E5=90=8D=E7=A7=B0=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/community/roomForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 2bb6faf93..507ea3642 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -11,7 +11,7 @@
 
         <el-form-item label="所属楼栋"
                       style="display: block">
-          <span>{{agencyObj.agencyName}}-{{ agencyObj.gridName}}-{{agencyObj.neighborHoodName}}</span>
+          <span>{{agencyObj.neighborHoodName}}-{{ dataForm.buildingName }}</span>
         </el-form-item>
 
         <el-form-item label="单元号"