Merge branch 'bug_mk' into feature

src/views/modules/shequ/chaxun.vue

@@ -187,6 +187,9 @@
               width="50"
             />
             <el-table-column prop="houseName" label="房屋名称" width="120">
+              <template slot-scope="scope">
+                  {{scope.row.quartersName|| '' + scope.row.buildingName || '' + scope.row.buildingUnitName || ''+ scope.row.houseName||''}}
+              </template>
             </el-table-column>
             <el-table-column prop="quartersName" label="所属小区" width="160">
             </el-table-column>