From 83f051915bbe4562abfb5f1589642dd393ea8490 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 22 八月 2025 10:43:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/cms/CuttingInventoryList.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/cms/CuttingInventoryList.vue b/src/views/cms/CuttingInventoryList.vue
index 65b96c9..7d31077 100644
--- a/src/views/cms/CuttingInventoryList.vue
+++ b/src/views/cms/CuttingInventoryList.vue
@@ -147,7 +147,7 @@
           {
             title:'鍒�鍏风紪鐮�',
             align:"center",
-            dataIndex: 'cuttingId'
+            dataIndex: 'cuttingId_dictText'
           },
           {
             title:'鍒�鍏锋潯鐮�',
@@ -179,7 +179,7 @@
           deleteBatch: "/cms/cuttingInventory/deleteBatch",
           exportXlsUrl: "/cms/cuttingInventory/exportXls",
           importExcelUrl: "cms/cuttingInventory/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

--
Gitblit v1.9.3