合并价格表单

1 year ago · e0784eb593
parent 5f4f525f45
commit e0784eb593
1 changed files with 0 additions and 6 deletions
--- a/src/views/products/Detail/ProductInfoForm.jsx
+++ b/src/views/products/Detail/ProductInfoForm.jsx
@ -92,13 +92,7 @@ const InfoForm = ({ formInstance, onSubmit, onReset, onValuesChange, editable, s
          )} */}
        </Row>
        {/* <Divider className='my-1' /> */}
-
-<<<<<<< HEAD
-        <ProductInfoLgc editable={editable} formInstance={form} />
-=======
        <ProductInfoLgc editable={editable} ignoreEditable={ignoreEditable} formInstance={form} />
-        <ProductInfoQuotation editable={editable} formInstance={form} />
->>>>>>> ab527e36c27b7e3d4f344c30675a93729ef7cf3c

        <Form.Item hidden name={'id'} label={'ID'}>
          <Input />