冲突

api/api.ts

@@ -197,14 +197,12 @@ export default {
 	erpInitialize(params){
 		return request(`${apiURL}/erp/erpInitialize`, "POST", params)
 	},
-<<<<<<< HEAD
 	//获取职业类别
 	occupationQry(params){
 		return request(`${apiURL}/metadata/occupationQry`, "POST", params)
-=======
+	},
 	// 邀请列表查询
 	queryInviteList(params){
 		return request(`${cffpURL}/partner/queryInviteList`, "POST", params)
->>>>>>> 1495f4acafaf8fff342343694c14365381fa09b9
 	}
 }