合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 service-common/src/main/java/com/java110/common/bmo/attendanceLog/impl/GetAttendanceLogBMOImpl.java

@@ -1,7 +1,7 @@
package com.java110.common.bmo.attendanceLog.impl;

import com.java110.common.bmo.attendanceLog.IGetAttendanceLogBMO;
import com.java110.dto.attendanceLog.AttendanceLogDto;
import com.java110.dto.attendanceClasses.AttendanceLogDto;
import com.java110.intf.common.IAttendanceLogInnerServiceSMO;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;