Merge remote-tracking branch 'origin/master'

mrzcc

2020-02-17 e64197421cf28099935f71f193989a3394d47fe0

 UserService/src/main/java/com/java110/user/smo/impl/OwnerRoomRelInnerServiceSMOImpl.java

@@ -1,13 +1,13 @@
package com.java110.user.smo.impl;


import com.java110.common.util.BeanConvertUtil;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.smo.owner.IOwnerRoomRelInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.OwnerRoomRelDto;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.user.UserDto;
import com.java110.user.dao.IOwnerRoomRelServiceDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -42,7 +42,6 @@

        if (page != PageDto.DEFAULT_PAGE) {
            ownerRoomRelDto.setPage((page - 1) * ownerRoomRelDto.getRow());
            ownerRoomRelDto.setRow(page * ownerRoomRelDto.getRow());
        }

        List<OwnerRoomRelDto> ownerRoomRels = BeanConvertUtil.covertBeanList(ownerRoomRelServiceDaoImpl.getOwnerRoomRelInfo(BeanConvertUtil.beanCovertMap(ownerRoomRelDto)), OwnerRoomRelDto.class);