替换api

src/pages/member/memberPrComingClassify/components/ComingClassifyDrawer/index.tsx

@@ -17,21 +17,13 @@ import {
   FormEffectHooks,
   FormPath,
 } from '@formily/antd';
-<<<<<<< HEAD
 import { getMemberDepositClassifyCity, getMemberDepositClassifyProvince } from '@/services/MemberV2Api';
-=======
->>>>>>> 1fb662be44e7d6f880b3e886f596bb2a2c814806
 import { useLinkageUtils } from '@/utils/formEffectUtils';
 import { ArrayCards } from '@formily/antd-components';
 import { schema } from './schema';
 import CascaderFormItem from '../../../components/CascaderFormItem';
 import styles from './index.less';
-<<<<<<< HEAD
 // import { getProductCustomerGetCustomerCategoryTree } from '@/services/ProductApi';
-=======
-import { getMemberDepositClassifyCity, getMemberDepositClassifyProvince } from '@/services/MemberV2Api/id9022';
-import { getProductCustomerGetCustomerCategoryTree } from '@/services/ProductV2Api/id6097';
->>>>>>> 1fb662be44e7d6f880b3e886f596bb2a2c814806
 
 type CategoriesType = {
   /**

src/pages/member/memberQuery/applyMember/index.tsx

@@ -22,11 +22,8 @@ import ReutrnEle from '@/components/ReturnEle';
 import NiceForm from '@/components/NiceForm';
 import MellowCard from '@/components/MellowCard';
 import NoData from '@/components/NoData';
-<<<<<<< HEAD
 import { getMemberAbilityInfoApplyDepositDetail, getMemberAbilityInfoDepositDetail, postMemberAbilityInfoApply, postMemberAbilityInfoDepositDetailUpdate } from '@/services/MemberV2Api';
 import { getManageContentNoticeFindAllByColumnType } from '@/services/ManageV2Api';
-=======
->>>>>>> 1fb662be44e7d6f880b3e886f596bb2a2c814806
 import { normalizeFiledata, FileData } from '@/utils';
 import schema, { GroupItem } from './schema';
 import { useBusinessEffects } from '../../components/QualitiesUploadFormItem/effects';
@@ -36,11 +33,6 @@ import SubmitSuccess from './components/SubmitSuccess';
 import QualitiesUpload from '../../components/QualitiesUpload';
 import QualitiesUploadFormItem from '../../components/QualitiesUploadFormItem';
 import AreaSelect from '../../components/AreaSelect';
-<<<<<<< HEAD
-=======
-import { getMemberAbilityInfoApplyDepositDetail, getMemberAbilityInfoDepositDetail, postMemberAbilityInfoApply, postMemberAbilityInfoDepositDetailUpdate } from '@/services/MemberV2Api/id9393';
-import { getManageContentNoticeFindAllByColumnType } from '@/services/ManageV2Api';
->>>>>>> 1fb662be44e7d6f880b3e886f596bb2a2c814806
 
 
 type ValueType = {
@@ -251,11 +243,8 @@ const MemberQueryApplyMember: React.FC<RouteComponentProps> = (props: any) => {
       });
     } else {
       postMemberAbilityInfoDepositDetailUpdate({
-<<<<<<< HEAD
         validateId: validateId as number,
-=======
-        validateId:  validateId as number,
->>>>>>> 1fb662be44e7d6f880b3e886f596bb2a2c814806
+        validateId: validateId as number,
         detail: step3,
         ...commonPayload,
       }).then(res => {