From cfce5a0402f09b7f7891f045a77b8a9ceea69e1f Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 04 三月 2021 23:29:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLeaveInfoService.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/IEmpLeaveInfoService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLeaveInfoService.java
index 824ae66..7f2ebdb 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLeaveInfoService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLeaveInfoService.java
@@ -78,5 +78,5 @@
*/
boolean momentToNormal(String ids);
- void importEmpLeaveInfo(List<List<Object>> listObject);
+ void importEmpLeaveInfo(List<List<Object>> listObject,List<String> returnList);
}
--
Gitblit v1.8.0