From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突

---
 java110-bean/src/main/java/com/java110/dto/attendanceClasses/AttendanceClassesTaskDetailDto.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/attendanceClassesTaskDetail/AttendanceClassesTaskDetailDto.java b/java110-bean/src/main/java/com/java110/dto/attendanceClasses/AttendanceClassesTaskDetailDto.java
similarity index 97%
rename from java110-bean/src/main/java/com/java110/dto/attendanceClassesTaskDetail/AttendanceClassesTaskDetailDto.java
rename to java110-bean/src/main/java/com/java110/dto/attendanceClasses/AttendanceClassesTaskDetailDto.java
index 26d956f..f84fbd6 100644
--- a/java110-bean/src/main/java/com/java110/dto/attendanceClassesTaskDetail/AttendanceClassesTaskDetailDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/attendanceClasses/AttendanceClassesTaskDetailDto.java
@@ -1,4 +1,4 @@
-package com.java110.dto.attendanceClassesTaskDetail;
+package com.java110.dto.attendanceClasses;
 
 import com.java110.dto.PageDto;
 

--
Gitblit v1.8.0