From 142f2e839bf76eff614ca7c07c30b5da2745681a Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 31 一月 2024 17:47:20 +0800
Subject: [PATCH] 处理冲突

---
 src/views/eam/EquipmentListOfMetrological.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/eam/EquipmentListOfMetrological.vue b/src/views/eam/EquipmentListOfMetrological.vue
index 9b350c8..71c665d 100644
--- a/src/views/eam/EquipmentListOfMetrological.vue
+++ b/src/views/eam/EquipmentListOfMetrological.vue
@@ -1,7 +1,7 @@
 <template>
   <a-card
     :bordered="false"
-    title="鏁版帶鍥炶浆搴�"
+    title="璁￠噺妫�娴嬭澶�"
   >
     <!-- 鏌ヨ鍖哄煙 -->
     <div class="table-page-search-wrapper">

--
Gitblit v1.9.3