Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack

Junjie

2024-03-26 3c788ea8129322b5779b8070fd019f814465ba51

 zy-asrs-flow/src/pages/map/components/configSettings.jsx

@@ -18,6 +18,7 @@
        form.resetFields();
        if (curSprite) {
            form.setFieldsValue({
                shelfType: Utils.SHELF_TYPE.STORE,
                ...curSprite.data
            })
        }
@@ -212,7 +213,6 @@
                                        value: Utils.SHELF_TYPE.DISABLE
                                    },
                                ]}
                                defaultValue={0}
                            />
                        </Form.Item>
                        <Form.Item