Merge remote-tracking branch 'origin/master'

mrzcc

2020-02-10 4f9c122f237fbee16d5ef9c602b6db95d28ed7b0

 CommunityService/src/main/java/com/java110/community/smo/impl/FloorInnerServiceSMOImpl.java

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

import com.java110.common.util.BeanConvertUtil;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.community.dao.IFloorServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.smo.floor.IFloorInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.FloorDto;
import com.java110.dto.PageDto;
import com.java110.dto.UnitDto;
import com.java110.dto.UserDto;
import com.java110.dto.user.UserDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
@@ -87,7 +86,6 @@

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