Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4

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

@@ -8,6 +8,8 @@
import org.jeecg.modules.mdc.vo.MdcDeviceCalendarVo;

import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;

/**
 * @Description: 设备工作日历表
@@ -27,4 +29,12 @@
     */
    boolean saveCalendar(EquipmentCalendarVo calendarVo);

    /**
     * 查询班制数据
     *
     * @param equipmentid
     * @param stringDates
     * @return
     */
    List<MdcDeviceCalendarVo> listByEquipmentAndDate(String equipmentid, List<String> stringDates);
}