From 512915919284d363b6a07fd6c9c54f145402fb0a Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期三, 10 三月 2021 02:55:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpResignService.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpResignService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpResignService.java
index 3f48f5c..91a2fb8 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpResignService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpResignService.java
@@ -1,5 +1,6 @@
 package cc.mrbird.febs.server.hr.service;
 
+import cc.mrbird.febs.common.core.exception.FebsException;
 import cc.mrbird.febs.server.hr.entity.EmpResign;
 
 import cc.mrbird.febs.common.core.entity.QueryRequest;
@@ -40,14 +41,14 @@
      *
      * @param empResign empResign
      */
-    void createEmpResign(EmpResign empResign);
+    void createEmpResign(EmpResign empResign) throws FebsException;
 
     /**
      * 修改
      *
      * @param empResign empResign
      */
-    void updateEmpResign(EmpResign empResign);
+    void updateEmpResign(EmpResign empResign) throws FebsException;
 
     /**
      * 删除
@@ -78,5 +79,5 @@
      */
     boolean momentToNormal(String ids);
 
-	void importEmpResign(List<List<Object>> listObject);
+	void importEmpResign(List<List<Object>> listObject,List<String>  returnList);
 }

--
Gitblit v1.8.0