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

skyouc

2025-05-20 843d5b6dd50567dadcc56257f074840e80d757aa

 rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupList.jsx

@@ -268,8 +268,8 @@
                    >
                        {expandAll ? translate('common.action.collapseAll') : translate('common.action.expandAll')}
                    </Button>
                    {/* <TextField
                        label="Search"
                    <TextField
                        label="搜索名称"
                        value={filter}
                        onChange={({ target }) => {
                            setFilter(target.value)
@@ -278,7 +278,7 @@
                        size="small"
                        margin="dense"
                        fullWidth
                    /> */}
                    />
                </Box>
                <Box>
                    <Button