From 698bbdfcbbe4939b0427c022eea67e45f58fd253 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 18 十一月 2025 15:51:21 +0800
Subject: [PATCH] Merge branch 'new' of http://www.beijingsoft.cn:9090/r/smart-web into new
---
src/views/tpm/MachineTab.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/tpm/MachineTab.vue b/src/views/tpm/MachineTab.vue
index 49a4e66..5c4e6fe 100644
--- a/src/views/tpm/MachineTab.vue
+++ b/src/views/tpm/MachineTab.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-27 20:04:34
* @LastEditors: gaoshp
- * @LastEditTime: 2024-09-24 21:03:08
+ * @LastEditTime: 2024-11-04 20:10:30
* @FilePath: /cps-web/src/views/tpm/MachineTab.vue
-->
<template>
@@ -47,7 +47,7 @@
<el-table-column type="selection" width="50"></el-table-column>
<el-table-column label="鏈哄櫒缂栧彿" prop="machineCode" width="120"></el-table-column>
<el-table-column label="鏈哄櫒鍚嶇О" prop="machineName" width="120"></el-table-column>
- <el-table-column label="鎵�灞炴満鍣ㄧ粍" prop="groupName" width="120"></el-table-column>
+ <el-table-column label="鎵�灞炶澶囩粍" prop="groupName" width="120"></el-table-column>
<el-table-column label="鏈哄櫒绫诲瀷" prop="machineTypeName" width="120"></el-table-column>
<el-table-column label="鏈哄櫒搴忓垪鍙�" prop="serialNo" width="120"></el-table-column>
<el-table-column label="鐭紪鍙�" prop="shortCode" width="120"></el-table-column>
--
Gitblit v1.9.3