Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

 src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.java

@@ -16,8 +16,10 @@
 */
package org.springblade.modules.discuss.mapper;

import io.lettuce.core.dynamic.annotation.Param;
import org.springblade.modules.discuss.dto.UserTopicsDTO;
import org.springblade.modules.discuss.entity.UserTopicsEntity;
import org.springblade.modules.discuss.excel.UserTopicsExcel;
import org.springblade.modules.discuss.vo.UserTopicsVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -48,4 +50,6 @@
    * @return 用户议题报表集合
    */
   public List<UserTopicsDTO> selectUserTopicsList(UserTopicsDTO userTopicsDTO);

    List<UserTopicsExcel> exportUser( UserTopicsVO userTopics);
}