解决冲突

skyouc

2025-11-27 af1722ee7ded25e74e5f2afaf212ab856c942d77

 rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogList.jsx

@@ -115,7 +115,7 @@
                    rowClick={'edit'}
                    expand={false}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                    omit={['id', 'createTime', 'createBy', 'memo','statusBool']}
                >
                    <NumberField source="id" />
                    <NumberField source="pakinId" label="table.field.waitPakinLog.pakinId" />