From 767f47d580e180e2574d9fc4d5379813fd80e5ba Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期四, 04 三月 2021 02:15:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpUnemploymentService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpUnemploymentService.java
index df92e31..f089eb4 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpUnemploymentService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpUnemploymentService.java
@@ -79,5 +79,5 @@
      */
     boolean momentToNormal(String ids);
 
-	void importEmpUnemployment(List<List<Object>> listObject);
+	void importEmpUnemployment(List<List<Object>> listObject,List<String>  returnList);
 }

--
Gitblit v1.8.0