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

diff --git a/service-common/src/main/java/com/java110/common/smo/impl/AttendanceClassesAttrInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/AttendanceClassesAttrInnerServiceSMOImpl.java
index 422def4..d38abdd 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/AttendanceClassesAttrInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/AttendanceClassesAttrInnerServiceSMOImpl.java
@@ -4,7 +4,7 @@
 import com.java110.common.dao.IAttendanceClassesAttrServiceDao;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.PageDto;
-import com.java110.dto.attendanceClassesAttr.AttendanceClassesAttrDto;
+import com.java110.dto.attendanceClasses.AttendanceClassesAttrDto;
 import com.java110.dto.user.UserDto;
 import com.java110.intf.common.IAttendanceClassesAttrInnerServiceSMO;
 import com.java110.utils.util.BeanConvertUtil;

--
Gitblit v1.8.0