Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms

zc

6 天以前 2db2c1328008ae399d8d7af56c9c6dc67a47bce8

 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" />