From 14a20df4699cf3d933e2bdbe1ba2aba15ade1059 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 26 十一月 2024 09:20:02 +0800
Subject: [PATCH] 解决冲突
---
admin/src/views/project/housingList.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/admin/src/views/project/housingList.vue b/admin/src/views/project/housingList.vue
index 57c75e9..8b09283 100644
--- a/admin/src/views/project/housingList.vue
+++ b/admin/src/views/project/housingList.vue
@@ -34,7 +34,7 @@
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="projectName" label="椤圭洰" min-width="100px"></el-table-column>
<el-table-column prop="buildingName" label="妤煎畤" min-width="70px"></el-table-column>
- <el-table-column prop="floor" label="妤煎眰" min-width="60px"></el-table-column>
+ <el-table-column prop="floorName" label="妤煎眰" min-width="60px"></el-table-column>
<el-table-column prop="roomNum" label="鎴垮彿" min-width="60px"></el-table-column>
<el-table-column prop="rentArea" label="璁＄闈㈢Н(m虏)" min-width="80px"></el-table-column>
<el-table-column prop="feeArea" label="璁¤垂闈㈢Н(m虏)" min-width="80px"></el-table-column>
--
Gitblit v1.9.3