合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 service-common/src/main/java/com/java110/common/bmo/attendanceClassesTaskDetail/IGetAttendanceClassesTaskDetailBMO.java

@@ -1,16 +1,28 @@
package com.java110.common.bmo.attendanceClassesTaskDetail;
import com.java110.dto.attendanceClassesTaskDetail.AttendanceClassesTaskDetailDto;

import com.java110.dto.attendanceClasses.AttendanceClassesTaskDto;
import com.java110.dto.attendanceClasses.AttendanceClassesTaskDetailDto;
import org.springframework.http.ResponseEntity;

public interface IGetAttendanceClassesTaskDetailBMO {


    /**
     * 查询考勤任务明细
     * add by wuxw
     * @param  attendanceClassesTaskDetailDto
     *
     * @param attendanceClassesTaskDetailDto
     * @return
     */
    ResponseEntity<String> get(AttendanceClassesTaskDetailDto attendanceClassesTaskDetailDto);


    /**
     * 查询月考勤
     * add by wuxw
     *
     * @param attendanceClassesTaskDto
     * @return
     */
    ResponseEntity<String> getMonthAttendance(AttendanceClassesTaskDto attendanceClassesTaskDto);
}