merge

src/utils/patients/patientsapi.js

@@ -151,8 +151,6 @@ export const deleteCurrentPatients = data => {
   })
 }
 
-<<<<<<< HEAD
-=======
 export const saveLabelsForPatient = (labelId, data) => {
   return fetch({
     headers,
@@ -162,7 +160,6 @@ export const saveLabelsForPatient = (labelId, data) => {
     description: '分组中添加居民',
   })
 }
->>>>>>> 4f5afc8ed770a74179b192c64944c2c0c7273804
 
 // 获取七牛上传token
 export const getQiniuToken = (params) => {