From b822ea020a6d4edec0d183af32532076cdca062c Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 09 May 2024 20:55:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/discuss/service/IUserTopicsService.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/discuss/service/IUserTopicsService.java b/src/main/java/org/springblade/modules/discuss/service/IUserTopicsService.java
index 85864c7..f34c44b 100644
--- a/src/main/java/org/springblade/modules/discuss/service/IUserTopicsService.java
+++ b/src/main/java/org/springblade/modules/discuss/service/IUserTopicsService.java
@@ -23,6 +23,7 @@
 import org.springblade.modules.discuss.vo.TopicsVO;
 import org.springblade.modules.discuss.vo.UserTopicsVO;
 
+import java.io.OutputStream;
 import java.util.List;
 
 /**
@@ -43,9 +44,13 @@
 	IPage<UserTopicsVO> selectUserTopicsPage(IPage<UserTopicsVO> page, UserTopicsVO userTopics);
 
 
-	String batchSave(List<TopicsVO> topics) throws Exception;
+	String batchSave(TopicsVO topics) throws Exception;
 
 	Integer getCount(Integer id);
 
 	List<UserTopicsExcel> exportUser(UserTopicsVO userTopics);
+
+    Boolean saveUserTopicsEntity(UserTopicsEntity userTopics);
+
+	void handleExcel(OutputStream out,UserTopicsVO userTopics);
 }

--
Gitblit v1.9.3