From 35c422aa74e47a2ee4bea49e6799fefac1b63713 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 13:39:47 +0800
Subject: [PATCH] Merge branch 'front' into devlop

---
 rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
index 6577af7..36e5df2 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
@@ -74,8 +74,8 @@
             minWidth: 100,
         },
         {
-            id: 'matnk',
-            label: 'table.field.asnOrderItem.matnk',
+            id: 'maktx',
+            label: 'table.field.asnOrderItem.maktx',
             minWidth: 100,
         },
         {
@@ -160,7 +160,7 @@
 
                     <TableBody>
                         {rows.map((row) => (
-                            <StyledTableRow key={row.id || Math.random()}>
+                            <StyledTableRow key={row.id + Math.random()}>
                                 {columns.map((column) => (
                                     <StyledTableCell key={column.id} >
                                         {row[column.id]}

--
Gitblit v1.9.1