From a332ffab46b0d30e85b73ec023aa4e30c7b69e52 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 12 三月 2021 02:36:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.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/IEmpContractInfoService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java
index c4e7795..b181820 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.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.EmpContractInfo;
import cc.mrbird.febs.common.core.entity.QueryRequest;
@@ -78,7 +79,7 @@
*/
boolean momentToNormal(String ids);
- void importEmpContractInfo(List<List<Object>> listObject);
+ void importEmpContractInfo(List<List<Object>> listObject,List<String> returnList,List<DicItem> dicItems );
void terminateContract(String empIds, String operatorId);
}
--
Gitblit v1.8.0