From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 16:35:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/page/orders/outStock/OutOrderList.jsx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index 9f620ff..47f94a0 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -173,7 +173,7 @@
           bulkActionButtons={<PublicTaskButton setWaveRule={setWaveRule} setSelectIds={setSelectIds} />}
           rowClick={false}
           expandSingle={true}
-          omit={['id', 'createTime', 'createBy', 'memo', 'rleStatus$']}
+          omit={['id', 'createTime', 'createBy$', 'memo', 'rleStatus$']}
         >
           <NumberField source="id" />
           <TextField source="code" label="table.field.outStock.code" />
@@ -222,7 +222,7 @@
         drawerVal={drawerVal}
         setDrawerVal={setDrawerVal}
       >
-        <OutStockPublic record={select} open={drawerVal} setOpen={setDrawerVal}  setManualDialog={setManualDialog}/>
+        <OutStockPublic record={select} open={drawerVal} setOpen={setDrawerVal}  />
       </PageEditDrawer>
     </Box >
   )

--
Gitblit v1.9.1