Merge remote-tracking branch 'origin/dev' into dev

fuliqi

2024-07-05 4e4e7828493ebfb9313ec6a3acd3b649d103d3e3

 src/main/java/com/ycl/jxkg/service/MessageService.java

@@ -1,9 +1,9 @@
package com.ycl.jxkg.service;

import com.ycl.jxkg.domain.Message;
import com.ycl.jxkg.domain.MessageUser;
import com.ycl.jxkg.vo.admin.message.MessagePageRequestVO;
import com.ycl.jxkg.vo.student.user.MessageRequestVO;
import com.ycl.jxkg.domain.entity.Message;
import com.ycl.jxkg.domain.entity.MessageUser;
import com.ycl.jxkg.domain.vo.admin.message.MessagePageRequestVO;
import com.ycl.jxkg.domain.vo.student.user.MessageRequestVO;
import com.github.pagehelper.PageInfo;

import java.util.List;