From 598e5c1d72e2176cc8d280e0726ac8eef323516e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 21 十一月 2023 15:43:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/eam/EquipmentListOfWeldingMachine.vue |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/views/eam/EquipmentListOfWeldingMachine.vue b/src/views/eam/EquipmentListOfWeldingMachine.vue
index c33c881..f9f0a3a 100644
--- a/src/views/eam/EquipmentListOfWeldingMachine.vue
+++ b/src/views/eam/EquipmentListOfWeldingMachine.vue
@@ -578,6 +578,11 @@
           dataIndex: 'specificEquipment_dictText',
         },
         {
+          title: '鎶�鏈姸鎬�',
+          align: "center",
+          dataIndex: 'technologyStatus_dictText',
+        },
+        {
           title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
           align: "center",
           dataIndex: 'technologyStatusVerificationType_dictText',

--
Gitblit v1.9.3