fix:

src/pages/transaction/purchaseOrder/orderCollect/components/productModalTable/index.tsx

@@ -138,11 +138,7 @@ const ProductModalTable:React.FC<ProductModalTableProps> = (props) => {
 
   const handleConfirmProduct = async () => {
     // 判断所选择的商品是否属于同一个工作流
-<<<<<<< HEAD
-    const { code, data } = await PublicApi.postOrderIsWorkFlow({productIds: rowSelectionCtl.selectedRowKeys}, { ctlType: 'none' })
-=======
     const res = await PublicApi.postOrderIsWorkFlow({memberId: rowSelectionCtl.selectRow[0].memberId, productIds: rowSelectionCtl.selectedRowKeys}, { ctlType: 'none' })
->>>>>>> 37febd41... fix：处理商城跳转过来的下单获取信息报错，处理销售订单审核是否使用合同参数异常
 
     if (res.code === 1000) {
       const productData = schemaAction.getFieldValue('orderProductRequests')