From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/discuss/controller/TopicsController.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/discuss/controller/TopicsController.java b/src/main/java/org/springblade/modules/discuss/controller/TopicsController.java
index f8e4b56..aa48157 100644
--- a/src/main/java/org/springblade/modules/discuss/controller/TopicsController.java
+++ b/src/main/java/org/springblade/modules/discuss/controller/TopicsController.java
@@ -25,16 +25,19 @@
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.discuss.dto.TopicsDTO;
 import org.springblade.modules.discuss.entity.TopicsEntity;
+import org.springblade.modules.discuss.entity.UserTopicsEntity;
 import org.springblade.modules.discuss.service.ITopicsService;
+import org.springblade.modules.discuss.service.IUserTopicsService;
 import org.springblade.modules.discuss.vo.TopicsVO;
 import org.springblade.modules.discuss.wrapper.TopicsWrapper;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -115,6 +118,7 @@
 		return R.status(topicsService.updateById(topics));
 	}
 
+
 	/**
 	 * 议题表 新增或修改
 	 */

--
Gitblit v1.9.3