Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

1

14 小时以前 59cac05c80955a0f144da9dfb59c50a9af518e27

Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

 rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx

@@ -187,6 +187,13 @@
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.matnr.model"
                                        source="model"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.matnr.weight"
                                        source="weight"