From 77946261ec663aa1fe7f6f97e550532ed879f982 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 13:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 admin/src/views/contract/components/contractDetail.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/src/views/contract/components/contractDetail.vue b/admin/src/views/contract/components/contractDetail.vue
index 5683288..47292ea 100644
--- a/admin/src/views/contract/components/contractDetail.vue
+++ b/admin/src/views/contract/components/contractDetail.vue
@@ -46,7 +46,7 @@
           <div class="val">{{ info.creatorName }}</div>
         </div>
         <div class="item">
-          <div class="la">鍚堝悓绉熻祦鏁�</div>
+          <div class="la">鍚堝悓绉熻祦闈㈢Н</div>
           <div class="val">{{ info.totalArea }}銕�</div>
         </div>
         <div class="item">
@@ -81,12 +81,12 @@
           <el-table-column prop="buildingName" label="妤煎畤鍚嶇О" show-overflow-tooltip />
           <el-table-column prop="" label="妤煎眰/鎴垮彿" show-overflow-tooltip>
             <template slot-scope="{row}">
-              {{row.floorName}}/{{row.code}}
+              {{row.floorName}}/{{row.roomNum}}
             </template>
           </el-table-column>
           <el-table-column prop="area" label="闈㈢Н" show-overflow-tooltip>
             <template slot-scope="{row}">
-              {{row.area}}銕�
+              {{row.rentArea}}銕�
             </template>
           </el-table-column>
         </el-table>

--
Gitblit v1.9.3