From c80c6b24a0d76321780d71c2d4249f5144693096 Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期二, 23 一月 2024 11:16:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 jcdm-ui/src/views/main/bs/material/index.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/jcdm-ui/src/views/main/bs/material/index.vue b/jcdm-ui/src/views/main/bs/material/index.vue
index 7e35df9..640c5c6 100644
--- a/jcdm-ui/src/views/main/bs/material/index.vue
+++ b/jcdm-ui/src/views/main/bs/material/index.vue
@@ -98,7 +98,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="浜у搧鍨嬪彿" align="center" prop="typeZ" width="150">
+      <el-table-column label="鏈哄瀷" align="center" prop="typeZ" width="150">
       </el-table-column>
       <el-table-column label="鐗规畩浠g爜" align="center" prop="mark" width="120">
       </el-table-column>

--
Gitblit v1.9.3