From 1cded29e225b3a73768d8badfc19fba825673451 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 12 六月 2024 09:30:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/views/Slicecage/slicecage.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index e87bae7..068a4da 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -529,7 +529,7 @@
         @selection-change="handleSelectionChange"
         :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
           <el-table-column prop="id" align="center" label="澶х悊鐗囩琛↖D" min-width="80" />
-          <el-table-column prop="deviceId" align="center" label="璁惧ID" min-width="120" />
+          <el-table-column prop="deviceId" align="center" label="鐞嗙墖绗煎彿" min-width="120" />
           <el-table-column prop="slot" align="center" label="鏍呮牸鍙�" min-width="120" />
           <el-table-column
             align="center"

--
Gitblit v1.8.0