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/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
index d922463..7331180 100644
--- a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
+++ b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
@@ -150,7 +150,7 @@
             title: '鐝',
             align: 'center',
             width: 80,
-            dataIndex: 'shiftSubId'
+            dataIndex: 'shift'
           },
           {
             title: '姣忕彮灏忔椂',

--
Gitblit v1.9.3