Merge remote-tracking branch 'origin/dev' into preview

* origin/dev:
  修改小区所属楼栋名称错误；
  人房搜索bug

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 {

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="单元号"