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/equipmentCalibrationOrder/EquipmentCalibrationOrderReportDrawerList.vue | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportDrawerList.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportDrawerList.vue index 5b84f6a..d489128 100644 --- a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportDrawerList.vue +++ b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportDrawerList.vue @@ -199,7 +199,7 @@ { title: '鍒ゅ畾缁撴灉', align: 'center', - dataIndex: 'judgmentResultName' + dataIndex: 'judgmentResult_dicText' }, { title: '鎿嶄綔', -- Gitblit v1.9.3