From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop

---
 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