From f193d5d14359b882af1ec10daf03dd69b04753b7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 29 Mar 2024 20:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.java b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.java
index 9e9b102..28df0a6 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.java
+++ b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.java
@@ -20,9 +20,12 @@
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.excel.householdExcel;
import org.springblade.modules.discuss.vo.UserTopicsVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.house.vo.HouseholdVO;
+
import java.util.List;
/**
@@ -51,5 +54,10 @@
*/
public List<UserTopicsDTO> selectUserTopicsList(UserTopicsDTO userTopicsDTO);
- List<UserTopicsExcel> exportUser( UserTopicsVO userTopics);
+ List<UserTopicsExcel> exportUser( @Param("userTopics") UserTopicsVO userTopics);
+ List<UserTopicsExcel> getresultTwo( @Param("userTopics") UserTopicsVO userTopics);
+
+ UserTopicsVO getresult(UserTopicsVO userTopics);
+
+ List<householdExcel> getHouseholdList(UserTopicsVO userTopics);
}
--
Gitblit v1.9.3