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

---
 service-common/src/main/java/com/java110/common/smo/impl/AttendanceClassesTaskDetailInnerServiceSMOImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/smo/impl/AttendanceClassesTaskDetailInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/AttendanceClassesTaskDetailInnerServiceSMOImpl.java
index f51a75f..f779ba0 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/AttendanceClassesTaskDetailInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/AttendanceClassesTaskDetailInnerServiceSMOImpl.java
@@ -4,7 +4,7 @@
 import com.java110.common.dao.IAttendanceClassesTaskDetailServiceDao;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.PageDto;
-import com.java110.dto.attendanceClassesTaskDetail.AttendanceClassesTaskDetailDto;
+import com.java110.dto.attendanceClasses.AttendanceClassesTaskDetailDto;
 import com.java110.intf.common.IAttendanceClassesTaskDetailInnerServiceSMO;
 import com.java110.po.attendanceClassesTaskDetail.AttendanceClassesTaskDetailPo;
 import com.java110.utils.util.BeanConvertUtil;

--
Gitblit v1.8.0