Merge remote-tracking branch 'origin/master'

孔祥富

2021-02-24 75b7365399fd87efb8691c909aedb5503b03ccc8

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java

@@ -8,6 +8,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;

import javax.servlet.http.HttpServletResponse;
import java.io.FileNotFoundException;
import java.util.List;
import java.util.Map;

@@ -174,4 +176,6 @@
     * @param listObject
     */
   void importEmpBaseInfo(List<List<Object>> listObject);

    void getImage(String empId, HttpServletResponse response) throws Exception;
}