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

whycq

2025-02-24 37e8e06c8d13146e62ef08d018d86443b9f42f00

 rsf-admin/src/page/dictType/DictTypeEdit.jsx

File was renamed from rsf-admin/src/page/customer/CustomerEdit.jsx
@@ -40,7 +40,7 @@
    )
}

const CustomerEdit = () => {
const DictTypeEdit = () => {
    const translate = useTranslate();

    return (
@@ -65,16 +65,15 @@
                        </Typography>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.customer.uuid"
                                source="uuid"
                                label="table.field.dictType.name"
                                source="name"
                                parse={v => v}
                                autoFocus
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.customer.name"
                                source="name"
                                label="table.field.dictType.description"
                                source="description"
                                parse={v => v}
                            />
                        </Stack>
@@ -94,4 +93,4 @@
    )
}

export default CustomerEdit;
export default DictTypeEdit;