From 14c2d7fc17595c86e7fe70f2d25f93a7d2c0a635 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期日, 07 三月 2021 13:59:23 +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 | 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/IEmpLaborTroubleService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java
index 6f25cb4..059a74f 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
@@ -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.EmpLaborTrouble;
import cc.mrbird.febs.common.core.entity.QueryRequest;
@@ -40,14 +41,14 @@
*
* @param empLabortrouble empLabortrouble
*/
- void createEmpLabortrouble(EmpLaborTrouble empLabortrouble);
+ void createEmpLabortrouble(EmpLaborTrouble empLabortrouble) throws FebsException;
/**
* 修改
*
* @param empLabortrouble empLabortrouble
*/
- void updateEmpLabortrouble(EmpLaborTrouble empLabortrouble);
+ void updateEmpLabortrouble(EmpLaborTrouble empLabortrouble) throws FebsException;
/**
* 删除
@@ -78,5 +79,5 @@
*/
boolean momentToNormal(String ids);
- void importEmpLaborTrouble(List<List<Object>> listObject);
+ void importEmpLaborTrouble(List<List<Object>> listObject,List<String> returnList);
}
--
Gitblit v1.8.0