From e331906c3191f012deb28ee18384a7087d987687 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 22 十一月 2023 19:16:57 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDeviceCalendarService.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDeviceCalendarService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDeviceCalendarService.java
index 4c2ce4a..54a6c0d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDeviceCalendarService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDeviceCalendarService.java
@@ -41,12 +41,11 @@
/**
* 璁＄畻瀹為檯鐝骇澶╂暟
*
- * @param shiftSubId
* @param equipmentId
* @param validDate
* @return
*/
- BigDecimal computeActualWorkDayCount(String shiftSubId, String equipmentId, String validDate);
+ BigDecimal computeActualWorkDayCount(String equipmentId, String validDate);
/**
* 鏌ヨ鐝鍒嗙被
@@ -60,12 +59,11 @@
/**
* 璁＄畻鐝鏃堕棿
*
- * @param shiftSubId
* @param equipmentId
* @param validDate
* @return
*/
- BigDecimal computeShiftTimeCount(String shiftSubId, String equipmentId, String validDate);
+ BigDecimal computeShiftTimeCount(String equipmentId, String validDate);
/**
* 鐢熸垚璁惧宸ヤ綔鏃ュ巻
--
Gitblit v1.9.3