合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 service-common/src/main/java/com/java110/common/smo/impl/AttendanceLogInnerServiceSMOImpl.java

@@ -4,7 +4,7 @@
import com.java110.common.dao.IAttendanceLogServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.attendanceLog.AttendanceLogDto;
import com.java110.dto.attendanceClasses.AttendanceLogDto;
import com.java110.intf.common.IAttendanceLogInnerServiceSMO;
import com.java110.po.attendanceLog.AttendanceLogPo;
import com.java110.utils.util.BeanConvertUtil;