From b129977dbaff2501459009577667ab11ed0163ab Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 28 十月 2024 18:31:07 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/jxkg-new

---
 src/main/java/com/ycl/jxkg/controller/admin/MessageController.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/controller/admin/MessageController.java b/src/main/java/com/ycl/jxkg/controller/admin/MessageController.java
index 7d813bd..5fae6ce 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/MessageController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/MessageController.java
@@ -3,20 +3,19 @@
 
 import com.ycl.jxkg.base.BaseApiController;
 import com.ycl.jxkg.base.Result;
-import com.ycl.jxkg.domain.Message;
-import com.ycl.jxkg.domain.MessageUser;
-import com.ycl.jxkg.domain.User;
+import com.ycl.jxkg.domain.entity.Message;
+import com.ycl.jxkg.domain.entity.MessageUser;
+import com.ycl.jxkg.domain.entity.User;
 import com.ycl.jxkg.service.MessageService;
 import com.ycl.jxkg.service.UserService;
 import com.ycl.jxkg.utils.DateTimeUtil;
 import com.ycl.jxkg.utils.PageInfoHelper;
-import com.ycl.jxkg.vo.admin.message.MessagePageRequestVO;
-import com.ycl.jxkg.vo.admin.message.MessageResponseVO;
-import com.ycl.jxkg.vo.admin.message.MessageSendVO;
+import com.ycl.jxkg.domain.vo.admin.message.MessagePageRequestVO;
+import com.ycl.jxkg.domain.vo.admin.message.MessageResponseVO;
+import com.ycl.jxkg.domain.vo.admin.message.MessageSendVO;
 import com.github.pagehelper.PageInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

--
Gitblit v1.8.0