Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

 src/main/java/org/springblade/modules/discuss/service/IUserTopicsService.java

@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.modules.discuss.entity.UserTopicsEntity;
import org.springblade.modules.discuss.excel.UserTopicsExcel;
import org.springblade.modules.discuss.vo.TopicsVO;
import org.springblade.modules.discuss.vo.UserTopicsVO;

@@ -42,7 +43,9 @@
   IPage<UserTopicsVO> selectUserTopicsPage(IPage<UserTopicsVO> page, UserTopicsVO userTopics);


   Boolean batchSave(List<TopicsVO> topics) throws Exception;
   String batchSave(List<TopicsVO> topics) throws Exception;

   Integer getCount(Integer id);

   List<UserTopicsExcel> exportUser(UserTopicsVO userTopics);
}