From dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 十月 2025 15:56:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 admin/src/views/business/jkCabinet.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/admin/src/views/business/jkCabinet.vue b/admin/src/views/business/jkCabinet.vue
index a15d6d7..e2182e2 100644
--- a/admin/src/views/business/jkCabinet.vue
+++ b/admin/src/views/business/jkCabinet.vue
@@ -44,7 +44,7 @@
         <el-table-column prop="devId" label="璁惧ID" min-width="100px"></el-table-column>
         <el-table-column prop="linkAddr" label="閫氳鍦板潃" min-width="100px"></el-table-column>
         <el-table-column prop="port" label="绔彛鍙�" min-width="100px"></el-table-column>
-        <el-table-column prop="lacation" label="鎵�鍦ㄤ綅缃�" min-width="100px"></el-table-column>
+        <el-table-column prop="location" label="鎵�鍦ㄤ綅缃�" min-width="100px"></el-table-column>
         <el-table-column label="鏌滄牸鏁伴噺" min-width="100px">
           <template slot-scope="{row}">
             <el-button @click="$refs.cabinetDetails.open(row.name + '-鏌滄牸淇℃伅', row.id)">{{row.gridNum}}</el-button>

--
Gitblit v1.9.3