merge: 解决冲突

src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/addForm.tsx

@@ -74,28 +74,6 @@ const AddedFormLayout: React.FC<AddedFormLayoutProps> = (props: any) => {
       setLoading(false)
     })
   }
-<<<<<<< HEAD
-  useEffect(() => {
-    if (id && type === 2) {
-      handleGetDetails();
-      setCount('3');
-    } else if (id && type === 3) {
-      const data: any = getCookie(spam_id);
-      const inquiryGoods: any[] = [];
-      inquiryGoods.push({
-        commodityId: id,
-        productId: data.id,
-        productName: data.name,
-        category: data.category,
-        brand: data.brand.name,
-        unit: data.unitName,
-        purchaseCount: 1,
-        logistics: data.logistics,
-        memberId: data.memberId,
-        memberRoleId: data.memberRoleId
-      })
-=======
->>>>>>> dev-srm
 
   const getMemberInfo = (value) => {
     form.setFieldsValue({ "memberName": value.name });