解决冲突

client/actions/common.js

@@ -211,8 +211,4 @@ const getTaskName = (currentTaskNum,childTaskNum=0)=>{
     }
 }
 
-<<<<<<< HEAD
-export {getStoreInfo,getInfoByBarcode,saveCommonInfo,getUserinfo,logout,startalljob,saveTaskListInfo,getTaskList,hasNoSku,getTaskName}
-=======
-export {getStoreInfo,getTaskInfo,saveCommonInfo,getUserinfo,logout,startalljob,saveTaskListInfo,getTaskList,hasNoSku,getTaskName}
->>>>>>> 完整回收流程
+export {getStoreInfo,saveCommonInfo,getUserinfo,logout,getTaskList,hasNoSku,getTaskName}