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

skyouc

6 天以前 3f2b778ab3fbee3d851ed7033451cc008366ab4b

 rsf-admin/src/page/components/EditBaseAside.jsx

@@ -23,9 +23,9 @@
                                {translate('common.edit.side.title')}
                            </Typography>
                            <Grid container rowSpacing={2} columnSpacing={1}>
                                <Grid item xs={12} display="flex" gap={1}>
                                {/* <Grid item xs={12} display="flex" gap={1}>
                                    <StatusField label="Status" />
                                </Grid>
                                </Grid> */}
                                <Grid item xs={12} display="flex" gap={1}>
                                    <AccessTimeIcon fontSize="small" color="disabled" />
                                    <Box flexGrow={1}>