合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 java110-bean/src/main/java/com/java110/dto/attendanceClasses/AttendanceClassesTaskDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/attendanceClassesTask/AttendanceClassesTaskDto.java
@@ -1,7 +1,6 @@
package com.java110.dto.attendanceClassesTask;
package com.java110.dto.attendanceClasses;

import com.java110.dto.PageDto;
import com.java110.dto.attendanceClassesTaskDetail.AttendanceClassesTaskDetailDto;

import java.io.Serializable;
import java.util.Date;