Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-04-16 e2fd80c79a61079256a7406024c65da0d0d22c36

 rsf-admin/src/page/system/role/AssignPermissions.jsx

@@ -177,11 +177,11 @@
            <Card sx={{
                ml: 1,
                mr: 1,
                height: '620px'
                height: 'calc(100vh - 140px)',
                overflowY: 'auto'
            }}>
                <CardContent sx={{
                    overflow: 'auto',
                    height: '100%',
                    display: 'flex',
                    flexDirection: 'column',
                    justifyContent: 'space-between'
@@ -218,7 +218,6 @@
                        </Box>

                        <Box sx={{
                            height: 480,
                            minWidth: 290,
                            overflow: 'auto',
                            marginTop: '10px',