修复冲突

src/pages/commodity/products/addProductsItem/logisticsForm.tsx

@@ -33,7 +33,7 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
   const [banCarriageType, setBanCarriageType] = useState(false)
   const [template, setTemplate] = useState(false) // 是否必填运费模板
 
-  const { productInfoByEdit, selectCategoryId, productPriceType, isCrossBorder, sendCycle, isCrossBorder } = ProductStore
+  const { productInfoByEdit, selectCategoryId, productPriceType, isCrossBorder, sendCycle } = ProductStore
 
   useEffect(() => {
     //传入ref给父级
@@ -91,9 +91,9 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
 
   useEffect(() => { logisticsForm.setFieldsValue({ sendCycle: sendCycle }) }, [sendCycle])
   useEffect(() => {
-    if(isCrossBorder) {
+    if (isCrossBorder) {
       logisticsForm.setFieldsValue({ deliveryType: 1 })
-      changeDeliveryType({target: { value: 1 }})
+      changeDeliveryType({ target: { value: 1 } })
     }
   }, [isCrossBorder])
 
@@ -102,7 +102,7 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
     setCarriageType(1)
     setIsTemplate(false)
     // 跨境商品类型编辑 不重置表单
-    if(!isCrossBorder || !history.location.query?.id) {
+    if (!isCrossBorder || !history.location.query?.id) {
       logisticsForm.resetFields()
     }
     logisticsForm.setFieldsValue({ deliveryType: e.target.value })
@@ -246,7 +246,7 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
         </Form.Item>
       }
       {
-       (deliveryType === 1 || deliveryType === 4) && <Form.Item
+        (deliveryType === 1 || deliveryType === 4) && <Form.Item
           name="company"
           label={intl.formatMessage({ id: 'commodity.products.addProductsItem.logisticsForm.form.company' })}
         >