合并分支

src/api/project/constructionUser/index.ts

@@ -1,5 +1,6 @@
 import request, { download } from '@/utils/request';
 import { AxiosPromise } from 'axios';
+<<<<<<< HEAD
 import {
   ConstructionUserForm,
   ConstructionUserQuery,
@@ -28,6 +29,9 @@ export const listConstructionMonth = (query?: ConstructionMonthQuery): AxiosProm
     params: query
   });
 };
+=======
+import { ConstructionUserForm, ConstructionUserQuery, ConstructionUserVO } from '@/api/project/constructionUser/types';
+>>>>>>> 7736f4a33624dcddf693271347dd34a922e58575
 
 /**
  * 查询施工人员列表
@@ -54,28 +58,6 @@ export const getConstructionUser = (id: string | number): AxiosPromise<Construct
   });
 };
 
-/**
- * 人员迁移
- * @param data
- */
-export const transferConstructionUser = (data: skipType) => {
-  return request({
-    url: '/project/constructionUser/change/project',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 查询项目以及项目下的分包公司列表
- */
-export const getProjectContractorList = () => {
-  return request({
-    url: '/project/project/list/project/contractorList',
-    method: 'get'
-  });
-};
-
 /**
  * 新增施工人员
  * @param data