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

verou

2025-03-25 91e70d462b00475b70edd42e84d3c257bc898b2c

 rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatEdit.jsx

@@ -71,7 +71,7 @@
                                autoFocus
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                        {/* <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.locAreaMat.warehouseId"
                                source="warehouseId"
@@ -82,7 +82,7 @@
                                label="table.field.locAreaMat.areaId"
                                source="areaId"
                            />
                        </Stack>
                        </Stack> */}
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.locAreaMat.depict"