From c46213fa824995bb2155c11ea332824d23232d9c Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 10 六月 2025 16:25:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/eam/QuanlityConfirmList.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/eam/QuanlityConfirmList.vue b/src/views/eam/QuanlityConfirmList.vue
index fbf88cf..e8d3e56 100644
--- a/src/views/eam/QuanlityConfirmList.vue
+++ b/src/views/eam/QuanlityConfirmList.vue
@@ -297,7 +297,7 @@
         {
           title: '浜у搧鎹熷け鎯呭喌',
           align: "center",
-          dataIndex: 'condition',
+          dataIndex: 'condition_dictText',
           width: 100
         },
         {

--
Gitblit v1.9.3