Merge remote-tracking branch 'origin/master'

luoyb

2021-05-31 3ae6bd194fe1f17b4f5d96cb78b057705e5d0d78

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLeaveInfoService.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.server.hr.entity.EmpLeaveInfo;

import cc.mrbird.febs.common.core.entity.QueryRequest;
@@ -78,5 +79,5 @@
     */
    boolean momentToNormal(String ids);

   void importEmpLeaveInfo(List<List<Object>> listObject);
   void importEmpLeaveInfo(List<List<Object>> listObject,List<String>  returnList,List<DicItem> dicItems );
}