Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

qushaowei

2023-11-22 e331906c3191f012deb28ee18384a7087d987687

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentOvertimeService.java

@@ -41,10 +41,9 @@
    /**
     * 计算加班时间
     *
     * @param shiftSubId
     * @param equipmentId
     * @param validDate
     * @return
     */
    BigDecimal computeOvertime(String shiftSubId, String equipmentId, String validDate);
    BigDecimal computeOvertime(String equipmentId, String validDate);
}