From 512915919284d363b6a07fd6c9c54f145402fb0a Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期三, 10 三月 2021 02:55:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
index 74188ee..83fbff7 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
@@ -1,5 +1,6 @@
 package cc.mrbird.febs.server.hr.service;
 
+import cc.mrbird.febs.common.core.entity.system.DicItem;
 import cc.mrbird.febs.common.core.exception.FebsException;
 import cc.mrbird.febs.server.hr.entity.*;
 
@@ -177,7 +178,7 @@
      * 导入员工
      * @param listObject
      */
-	void importEmpBaseInfo(List<List<Object>> listObject,List<String>  returnList) throws FebsException;
+	void importEmpBaseInfo(List<List<Object>> listObject,List<String>  returnList,List<DicItem> dicItems) throws FebsException;
 
     void getImage(String empId, HttpServletResponse response) throws Exception;
 

--
Gitblit v1.8.0