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

xiangpei

2024-07-11 5073a245f53fd5ca936e779be8c6b9b19d42f67d

 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;