From c743f4413a00fc063bbbd9d851b6d0c3fff10581 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 31 七月 2023 10:04:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-other/src/main/java/com/dsh/other/controller/AskedQuestionsController.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/AskedQuestionsController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/AskedQuestionsController.java
index ae9072a..de00064 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/AskedQuestionsController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/AskedQuestionsController.java
@@ -7,10 +7,7 @@
import com.dsh.other.model.vo.questionVo.QuestionIns;
import com.dsh.other.service.FrequentlyAskedQuestionsService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -29,8 +26,7 @@
@PostMapping("/base/notice/queryQuestionDetails")
- public QuestionDetailsVo getSysQuestionDetails(){
- QuestionDetailsVo notices = new QuestionDetailsVo();
+ public List<QuestionIns> getSysQuestionDetails(){
List<QuestionIns> sysS = new ArrayList<>();
List<FrequentlyAskedQuestions> list = faqService.list(new QueryWrapper<FrequentlyAskedQuestions>()
.eq("state", 1)
@@ -43,14 +39,13 @@
notice.setQuesContents(noList.getAnswer());
sysS.add(notice);
});
- notices.setSysS(sysS);
}
- return notices;
+ return sysS;
}
@PostMapping("/base/notice/queryQuestion")
- public QuestionIns getSysQuestionBuId(@RequestBody Integer quesId){
+ public QuestionIns getSysQuestionBuId(@RequestParam("quesId") Integer quesId){
QuestionIns sysNotice = new QuestionIns();
FrequentlyAskedQuestions notice = faqService.getById(quesId);
if (null != notice){
--
Gitblit v1.7.1