Merge remote-tracking branch 'origin/master'

portal-manager-ui/admin/src/api/dataAdmin.js

@@ -26,7 +26,6 @@ export function getBusinessEvent(params) {
   return http.get(`${BASEURL}/inter/reportform/busanalyse`, params)
 }
 //查询业务人员信息
-<<<<<<< HEAD
 export function getWorkerInfo(params){
   return http.get(`${baseURL}/basics_api/base/workman/info`,params)
 }
@@ -75,10 +74,7 @@ export function getBillList(params) {
 export function getPrintList(params) {
   return http.post(`${baseURL}/fm/matter/datum/print/list`, params);
 }
-=======
-export function getWorkerInfo(params) {
-  return http.get(`${baseURL}/basics_api/base/workman/info`, params)
-}
+
 //查询业务人员业务数据分析
 export function getWorkmananalyse(params) {
   return http.get(`${BASEURL}/inter/reportform/workmananalyse`, params)
@@ -100,4 +96,3 @@ export function getCallQueList(params) {
   return http.post(`${BASEURL}/inter/reportform/callQueList`, params)
 }
 
->>>>>>> 0334a060231b88a82691e8a4f429b0ab38bdddc5