fix: 处理冲突

package.json

@@ -60,8 +60,8 @@
     "@formily/antd-components": "^1.3.3",
     "@lingxi-disign/core": "^1.0.1",
     "@lingxi-disign/react": "^1.0.3",
-    "@lingxi-disign/ui": "^1.0.1",
     "@lingxi-disign/react-web": "^1.0.2",
+    "@lingxi-disign/ui": "^1.0.1",
     "@turf/turf": "^6.4.0",
     "@types/crypto-js": "^4.0.1",
     "@types/js-cookie": "^2.2.6",

src/pages/transaction/components/detailLayout/components/listLayout/index.tsx

 import React, { useRef } from 'react';
-<<<<<<< HEAD
-import { } from 'antd';
-=======
 import { Table } from 'antd';
->>>>>>> dev-srm
 import { StandardTable } from 'god';
 import { ColumnType } from 'antd/lib/table/interface';
 import Card from '../../../card';

src/pages/transaction/components/detailLayout/index.tsx

@@ -24,11 +24,7 @@ export interface IProps {
   /** 页面的组件 */
   components?: React.ReactNode,
   /** 隐藏头部分割线 */
-<<<<<<< HEAD
-  hideBreak?: boolean
-=======
   hideBreak?: boolean,
->>>>>>> dev-srm
 }
 
 const PeripheralLayout: React.FC<IProps> = (props: any) => {

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

@@ -10,7 +10,7 @@ import BasicLayout from '@/pages/transaction/components/detailLayout/components/
 import moment from 'moment';
 import { useEffect } from 'react';
 import { ACTIVITYTYPE, ACTIVITYTYPENAME } from './constants';
-import StatusTag from '@/pages/member/components/StatusTag';
+import StatusTag from '@/components/StatusTag';
 import ActivityUserLayout from '../../components/activityUserLayout';
 import DemandLayout from '../../components/demandLayout';
 import ListLayout from '@/pages/transaction/components/detailLayout/components/listLayout';

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

@@ -10,7 +10,7 @@ import BasicLayout from '@/pages/transaction/components/detailLayout/components/
 import moment from 'moment';
 import { useEffect } from 'react';
 import { ACTIVITYTYPE, ACTIVITYTYPENAME } from './constants';
-import StatusTag from '@/pages/member/components/StatusTag';
+import StatusTag from '@/components/StatusTag';
 import ActivityUserLayout from '../../components/activityUserLayout';
 import DemandLayout from '../../components/demandLayout';
 import ListLayout from '@/pages/transaction/components/detailLayout/components/listLayout';

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

@@ -10,7 +10,7 @@ import BasicLayout from '@/pages/transaction/components/detailLayout/components/
 import moment from 'moment';
 import { useEffect } from 'react';
 import { ACTIVITYTYPE, ACTIVITYTYPENAME } from './constants';
-import StatusTag from '@/pages/member/components/StatusTag';
+import StatusTag from '@/components/StatusTag';
 import ActivityUserLayout from '../../components/activityUserLayout';
 import DemandLayout from '../../components/demandLayout';
 import ListLayout from '@/pages/transaction/components/detailLayout/components/listLayout';

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

@@ -10,7 +10,7 @@ import BasicLayout from '@/pages/transaction/components/detailLayout/components/
 import moment from 'moment';
 import { useEffect } from 'react';
 import { ACTIVITYTYPE, ACTIVITYTYPENAME } from './constants';
-import StatusTag from '@/pages/member/components/StatusTag';
+import StatusTag from '@/components/StatusTag';
 import ActivityUserLayout from '../../components/activityUserLayout';
 import DemandLayout from '../../components/demandLayout';
 import ListLayout from '@/pages/transaction/components/detailLayout/components/listLayout';