From 769554d454e60374aa6b3a36c2ec7b284371134b Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期二, 31 十月 2023 15:25:14 +0800
Subject: [PATCH] Merge branch '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