From cf637bd648a40c4cc00d738785c947f27728f843 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期一, 22 二月 2021 01:36:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java
index 6c43e4e..6f25cb4 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java
@@ -77,4 +77,6 @@
      * @author: luoyibo
      */
     boolean momentToNormal(String ids);
+
+	void importEmpLaborTrouble(List<List<Object>> listObject);
 }

--
Gitblit v1.8.0