From ae3ad906ed4b09f72fc716957c4dbbe16341b38f Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 26 十二月 2023 11:39:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/eam/modules/dailyInspectionOrder/DailyInspectionStandardList.vue |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionStandardList.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionStandardList.vue
index 22932f2..c013607 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionStandardList.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionStandardList.vue
@@ -160,12 +160,7 @@
           dataIndex: 'num',
         },
         {
-          title: '鐗堟湰',
-          align: 'center',
-          dataIndex: 'version',
-        },
-        {
-          title: '璁惧缂栫爜',
+          title: '缁熶竴缂栫爜',
           align: 'center',
           dataIndex: 'equipmentNum',
         },
@@ -185,10 +180,15 @@
           dataIndex: 'equipmentSpecification'
         },
         {
-          title: '瀵硅薄閮ㄩ棬',
+          title: '浣跨敤閮ㄩ棬',
           align: "center",
           dataIndex: 'useDepartName'
         },
+        {
+          title: '鐗堟湰',
+          align: 'center',
+          dataIndex: 'version',
+        },
       ],
       url: {
         list: "/eam/inspectionStandard/findInspectionStandardList",

--
Gitblit v1.9.3