From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UserService/src/main/java/com/java110/user/smo/impl/OwnerRoomRelInnerServiceSMOImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/UserService/src/main/java/com/java110/user/smo/impl/OwnerRoomRelInnerServiceSMOImpl.java b/UserService/src/main/java/com/java110/user/smo/impl/OwnerRoomRelInnerServiceSMOImpl.java
index 2ce285f..2c968e5 100644
--- a/UserService/src/main/java/com/java110/user/smo/impl/OwnerRoomRelInnerServiceSMOImpl.java
+++ b/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;

--
Gitblit v1.8.0