diff --git a/hb_client/src/api/hrm.js b/hb_client/src/api/hrm.js
index 8a6b551..6a2a20c 100644
--- a/hb_client/src/api/hrm.js
+++ b/hb_client/src/api/hrm.js
@@ -13,7 +13,6 @@ export function clockRecord(data) {
     data
   })
 }
-<<<<<<< HEAD
 //员工离岗说明
 export function notWork(id, data) {
   return request({
@@ -23,7 +22,6 @@ export function notWork(id, data) {
   })
 }
 
-=======
 export function getEmployee(data) {
   return request({
     url: '/hrm/employee/',
@@ -31,4 +29,3 @@ export function getEmployee(data) {
     data
   })
 }
->>>>>>> 802cd214bef263b51b08f9299e5a7bd9ec93b8ef