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/bmo/attendanceClassesTask/impl/GetAttendanceClassesTaskBMOImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/bmo/attendanceClassesTask/impl/GetAttendanceClassesTaskBMOImpl.java b/service-common/src/main/java/com/java110/common/bmo/attendanceClassesTask/impl/GetAttendanceClassesTaskBMOImpl.java
index 0f36c01..075d10d 100644
--- a/service-common/src/main/java/com/java110/common/bmo/attendanceClassesTask/impl/GetAttendanceClassesTaskBMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/bmo/attendanceClassesTask/impl/GetAttendanceClassesTaskBMOImpl.java
@@ -1,7 +1,7 @@
 package com.java110.common.bmo.attendanceClassesTask.impl;
 
 import com.java110.common.bmo.attendanceClassesTask.IGetAttendanceClassesTaskBMO;
-import com.java110.dto.attendanceClassesTask.AttendanceClassesTaskDto;
+import com.java110.dto.attendanceClasses.AttendanceClassesTaskDto;
 import com.java110.intf.common.IAttendanceClassesTaskInnerServiceSMO;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;

--
Gitblit v1.8.0