From 85973ffba77aeff71f2dbd588c7fb81f89148fdc Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 18 二月 2025 08:20:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 rsf-admin/src/page/matnr/MatnrList.jsx |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/rsf-admin/src/page/matnr/MatnrList.jsx b/rsf-admin/src/page/matnr/MatnrList.jsx
index fd4ef7b..a2abf5a 100644
--- a/rsf-admin/src/page/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/matnr/MatnrList.jsx
@@ -63,7 +63,6 @@
     <DateInput label='common.time.after' source="timeStart" alwaysOn />,
     <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
 
-    <TextInput source="uuid" label="table.field.matnr.uuid" />,
     <ReferenceInput source="shipperId" label="table.field.matnr.shipperId" reference="shipper">
         <AutocompleteInput label="table.field.matnr.shipperId" optionText="name" filterToQuery={(val) => ({ name: val })} />
     </ReferenceInput>,
@@ -149,7 +148,6 @@
                     omit={['id', 'createTime', 'createBy', 'memo']}
                 >
                     <NumberField source="id" />
-                    <TextField source="uuid" label="table.field.matnr.uuid" />
                     <ReferenceField source="shipperId" label="table.field.matnr.shipperId" reference="shipper" link={false} sortable={false}>
                         <TextField source="name" />
                     </ReferenceField>

--
Gitblit v1.9.1