Merge remote-tracking branch 'origin/master'

mrzcc

2020-02-17 e64197421cf28099935f71f193989a3394d47fe0

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

@@ -5,9 +5,9 @@
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;