From c5cf095903c50112f71612272911d53e9c86b7e0 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期五, 12 三月 2021 09:10:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpOccupationalService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpOccupationalService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpOccupationalService.java
index deaedb0..cbfbf69 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpOccupationalService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpOccupationalService.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.EmpOccupational;
import cc.mrbird.febs.common.core.entity.QueryRequest;
@@ -40,7 +41,7 @@
*
* @param empOccupational empOccupational
*/
- void createEmpOccupational(EmpOccupational empOccupational);
+ void createEmpOccupational(EmpOccupational empOccupational) throws FebsException;
/**
* 修改
@@ -78,5 +79,5 @@
*/
boolean momentToNormal(String ids);
- void importEmpOccupational(List<List<Object>> listObject);
+ void importEmpOccupational(List<List<Object>> listObject,List<String> returnList);
}
--
Gitblit v1.8.0