Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

src/pages/transaction/dealAbility/confirmOffer/offerSearch/index.tsx

 import React, { useRef } from 'react';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { getIntl, history } from 'umi';
 import { Tag, Badge, Button } from 'antd';
 import { ColumnType } from 'antd/lib/table/interface';

src/pages/transaction/dealAbility/confirmOffer/waitAuditInquiryOne/index.tsx

 import React, { useRef, useState } from 'react';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { getIntl, history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';

src/pages/transaction/dealAbility/confirmOffer/waitAuditInquiryTwo/index.tsx

 import React, { useRef, useState } from 'react';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { getIntl, history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';

src/pages/transaction/dealAbility/confirmOffer/waitSubmitAuditOffer/index.tsx

 import React, { useRef, useState } from 'react';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { getIntl, history } from 'umi';
 import { Tag, Badge, Button, Row, Col } from 'antd';
 import { ColumnType } from 'antd/lib/table/interface';

src/pages/transaction/dealAbility/confirmOffer/waitSubmitOffer/index.tsx

 import React, { useRef, useState } from 'react';
 import { getIntl, history } from 'umi';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { Tag, Badge, Button, Row, Col } from 'antd';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';

src/pages/transaction/dealAbility/inquiryOffer/inquirySearch/index.tsx

 import React, { useRef, useState, useEffect } from 'react';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { getIntl, history } from 'umi';
 import { Tag, Button, Modal, Form, Select, Typography } from 'antd';
 import { ColumnType } from 'antd/lib/table/interface';

src/pages/transaction/dealAbility/inquiryOffer/offerSearch/index.tsx

 import React, { useRef } from 'react';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { getIntl, history } from 'umi';
 import { Tag, Badge } from 'antd';
 import { ColumnType } from 'antd/lib/table/interface';

src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/index.tsx

 import React, { useRef, useState } from 'react';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { getIntl, history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';

src/pages/transaction/dealAbility/inquiryOffer/waitAuditOfferOne/index.tsx

 import React, { useRef, useState } from 'react';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { getIntl, history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';

src/pages/transaction/dealAbility/inquiryOffer/waitAuditOfferTwo/index.tsx

 import React, { useRef, useState } from 'react';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { getIntl, history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';

src/pages/transaction/dealAbility/inquiryOffer/waitSubmitOffer/index.tsx

 import React, { useRef, useState } from 'react';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment'

src/pages/transaction/dealAbility/productInquiry/inquirySearch/index.tsx

 import React, { useRef } from 'react';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { Tag, Badge } from 'antd';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';

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

 import React, { useRef, useState } from 'react';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { getIntl, history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';

src/pages/transaction/dealAbility/productInquiry/waitAuditInquiryOne/index.tsx

 import React, { useRef, useState } from 'react';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { getIntl, history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';

src/pages/transaction/dealAbility/productInquiry/waitAuditInquiryTwo/index.tsx

 import React, { useRef, useState } from 'react';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { getIntl, history } from 'umi';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';

src/pages/transaction/dealAbility/productInquiry/waitSubmitInquiry/index.tsx

 import React, { useRef, useState } from 'react';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment'

src/pages/transaction/logisticsAbility/logisticsAdminister/freightTemplate/index.tsx

 import React, { useRef } from 'react';
 import { getIntl, history } from 'umi';
 import { Button, Row, Col, Space, Popconfirm, Switch } from 'antd';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { ColumnType } from 'antd/lib/table/interface';
 import { LOGISTICSADMINISTERSCHEMA } from '../schema';
 import { PlusOutlined } from '@ant-design/icons';

src/pages/transaction/logisticsAbility/logisticsAdminister/logisticsCompanyManage/index.tsx

 import React, { useRef } from 'react';
 import { getIntl, history } from 'umi';
 import { Button, Row, Col, Space, Popconfirm } from 'antd';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { ColumnType } from 'antd/lib/table/interface';
 import { LOGISTICSADMINISTERSCHEMA } from '../schema';
 import { PlusOutlined } from '@ant-design/icons';

src/pages/transaction/logisticsAbility/logisticsAdminister/receivingAddress/index.tsx

 import React, { useRef } from 'react';
 import { getIntl, history } from 'umi';
 import { Button, Row, Col, Space, Popconfirm, Switch } from 'antd';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { ColumnType } from 'antd/lib/table/interface';
 import { LOGISTICSADMINISTERSCHEMA } from '../schema';
 import { PlusOutlined } from '@ant-design/icons';

src/pages/transaction/logisticsAbility/logisticsAdminister/shipmentsAddress/index.tsx

 import React, { useRef } from 'react';
 import { getIntl, history } from 'umi';
 import { Button, Row, Col, Space, Popconfirm, Switch } from 'antd';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { ColumnType } from 'antd/lib/table/interface';
 import { LOGISTICSADMINISTERSCHEMA } from '../schema';
 import { PlusOutlined } from '@ant-design/icons';

src/pages/transaction/logisticsAbility/logisticsBillManage/logisticsBillQuery/index.tsx

 import React from 'react';
 import { Tag } from 'antd';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { ColumnType } from 'antd/lib/table/interface';
 import { LOGISTICSBILLQUERYSCHEMA, EXTERNALSTATE_COLOR } from '../schema';
 import moment from 'moment';

src/pages/transaction/logisticsAbility/logisticsBillManage/waitConfirmLogisticsBill/index.tsx

 import React from 'react';
 import { Tag, Button } from 'antd';
 import { getIntl, history } from 'umi';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { ColumnType } from 'antd/lib/table/interface';
 import { LOGISTICSBILLQUERYSCHEMA, EXTERNALSTATE_COLOR } from '../schema';
 import moment from 'moment';

src/pages/transaction/logisticsAbility/logisticsBillSubmit/logisticsBillQuery/index.tsx

 import React from 'react';
 import { Tag } from 'antd';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { ColumnType } from 'antd/lib/table/interface';
 import { LOGISTICSBILLQUERYSCHEMA, EXTERNALSTATE_COLOR } from '../schema';
 import moment from 'moment';

src/pages/transaction/logisticsAbility/logisticsBillSubmit/waitSbumitLogisticsBill/index.tsx

 import React, { useRef } from 'react';
 import { Tag, Row, Col, Button, Space, Popconfirm } from 'antd';
 import { getIntl, history } from 'umi';
-import Table from '@/pages/transaction/components/tableLayout';
+import Table from '@/components/TableLayout';
 import { ColumnType } from 'antd/lib/table/interface';
 import { WAITSBUMITLOGISTICSBILLSCHEMA, EXTERNALSTATE_COLOR } from '../schema';
 import moment from 'moment';

src/pages/transaction/marketingAbility/paltformSign/readyExamineOne/index.tsx

 import { useIntl } from 'umi';
 import React, { useRef, useState } from 'react';
 import { history } from 'umi';
-import TableLayout from '../../../components/tableLayout';
+import TableLayout from '../../../../../components/TableLayout';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { ColumnType } from 'antd/lib/table/interface';
 import StatusTag from '@/components/StatusTag';

src/pages/transaction/marketingAbility/paltformSign/readyExamineTwo/index.tsx

 import { useIntl } from 'umi';
 import React, { useRef, useState } from 'react';
 import { history } from 'umi';
-import TableLayout from '../../../components/tableLayout';
+import TableLayout from '../../../../../components/TableLayout';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { ColumnType } from 'antd/lib/table/interface';
 import StatusTag from '@/components/StatusTag';

src/pages/transaction/marketingAbility/paltformSign/readySubmit/index.tsx

 import { useIntl } from 'umi';
 import React, { useState, useRef } from 'react';
-import TableLayout from '../../../components/tableLayout';
+import TableLayout from '../../../../../components/TableLayout';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { ColumnType } from 'antd/lib/table/interface';
 import StatusTag from '@/components/StatusTag';

src/pages/transaction/marketingAbility/paltformSign/readySubmitExamine/index.tsx

 import { useIntl } from 'umi';
 import React, { useRef, useState } from 'react';
 import { history } from 'umi';
-import TableLayout from '../../../components/tableLayout';
+import TableLayout from '../../../../../components/TableLayout';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { ColumnType } from 'antd/lib/table/interface';
 import StatusTag from '@/components/StatusTag';

src/pages/transaction/marketingAbility/paltformSign/search/index.tsx

 import { useIntl } from 'umi';
 
 import React from 'react';
-import TableLayout from '../../../components/tableLayout';
+import TableLayout from '../../../../../components/TableLayout';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';

src/pages/transaction/marketingAbility/platformexeCution/search/index.tsx

@@ -5,7 +5,7 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { format } from '@/pages/transaction/common/dateFormat';
 import { ColumnType } from 'antd/lib/table/interface';
 import { getMarketingAbilityActivityExecutePlatformPage, getMarketingPlatformActivitySignupGetActivityTypeList, getMarketingPlatformActivitySignupGetOuterStatusList } from '@/services/MarketingV2Api';
-import TableLayout from '../../../components/tableLayout';
+import TableLayout from '../../../../../components/TableLayout';
 import { OuterStatusColor } from '../../common/tagColor';
 import { PATTERN_MAPS } from '@/constants/regExp';
 import { useLinkageUtils } from '@/utils/formEffectUtils';

src/pages/transaction/marketingAbility/selfManagement/readyExamineOne/index.tsx

@@ -3,7 +3,7 @@ import { useIntl } from 'umi';
 import React, { useRef, useState } from 'react';
 import { history } from 'umi';
 import { Button, Row, Col, Tag, Badge } from 'antd'
-import TableLayout from '@/pages/transaction/components/tableLayout'
+import TableLayout from '@/components/TableLayout'
 import { ColumnType } from 'antd/lib/table';
 import EyePreview from '@/components/EyePreview';
 import { format } from '@/pages/transaction/common/dateFormat';

src/pages/transaction/marketingAbility/selfManagement/readyExamineTwo/index.tsx

@@ -2,7 +2,7 @@ import { useIntl } from 'umi';
 import React, { useRef, useState } from 'react';
 import { Button, Row, Col, Tag, Badge } from 'antd'
 import { history } from 'umi';
-import TableLayout from '@/pages/transaction/components/tableLayout'
+import TableLayout from '@/components/TableLayout'
 import { ColumnType } from 'antd/lib/table';
 import EyePreview from '@/components/EyePreview';
 import { format } from '@/pages/transaction/common/dateFormat';

src/pages/transaction/marketingAbility/selfManagement/readyLive/index.tsx

 import { useIntl } from 'umi';
 import React, { Fragment, useRef, useState } from 'react';
 import { Button, Row, Col, Popconfirm, Tag, Badge } from 'antd'
-import TableLayout from '@/pages/transaction/components/tableLayout'
+import TableLayout from '@/components/TableLayout'
 import { ColumnType } from 'antd/lib/table';
 import EyePreview from '@/components/EyePreview';
 import { format } from '@/pages/transaction/common/dateFormat';

src/pages/transaction/marketingAbility/selfManagement/readySubmit/index.tsx

 import { useIntl } from 'umi';
 import React, { Fragment, useRef, useState } from 'react';
 import { Button, Row, Col, Popconfirm, Tag, Badge } from 'antd'
-import TableLayout from '@/pages/transaction/components/tableLayout'
+import TableLayout from '@/components/TableLayout'
 import { ColumnType } from 'antd/lib/table';
 import EyePreview from '@/components/EyePreview';
 import { format } from '@/pages/transaction/common/dateFormat';

src/pages/transaction/marketingAbility/selfManagement/readySubmitExamine/index.tsx

@@ -3,7 +3,7 @@ import { useIntl } from 'umi';
 import React, { Fragment, useRef, useState } from 'react';
 import { history } from 'umi';
 import { Button, Row, Col, Space, Popconfirm, Tag, Badge } from 'antd';
-import TableLayout from '@/pages/transaction/components/tableLayout'
+import TableLayout from '@/components/TableLayout'
 import { ColumnType } from 'antd/lib/table';
 import EyePreview from '@/components/EyePreview';
 import { format } from '@/pages/transaction/common/dateFormat';

src/pages/transaction/marketingAbility/selfManagement/search/index.tsx

@@ -2,7 +2,7 @@ import { useIntl } from 'umi';
 import React, { Fragment, useRef, useState } from 'react';
 import { Badge, Button, Tag } from 'antd';
 import { history } from 'umi';
-import TableLayout from '@/pages/transaction/components/tableLayout'
+import TableLayout from '@/components/TableLayout'
 import { ColumnType } from 'antd/lib/table';
 import EyePreview from '@/components/EyePreview';
 import { format } from '@/pages/transaction/common/dateFormat';

src/pages/transaction/marketingAbility/selfbuiltexeCution/search/index.tsx

@@ -5,7 +5,7 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { ColumnType } from 'antd/lib/table/interface';
 import { format } from '@/pages/transaction/common/dateFormat';
 import { getMarketingAbilityActivityExecuteMerchantPage, getMarketingMerchantActivityGetActivityTypeList, getMarketingMerchantActivityGetInnerStatusList } from '@/services/MarketingV2Api';
-import TableLayout from '../../../components/tableLayout';
+import TableLayout from '../../../../../components/TableLayout';
 import { InnerStatusColor } from '../../common/tagColor';
 import { PATTERN_MAPS } from '@/constants/regExp';
 import { useLinkageUtils } from '@/utils/formEffectUtils';