From 276571374e8f0e2be2bdcfc5e8ea4a39af1599bc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 01 八月 2023 09:42:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-other/src/main/java/com/dsh/other/controller/AskedQuestionsController.java | 6 ++----
1 files changed, 2 insertions(+), 4 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 0f7bd74..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
@@ -26,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)
@@ -40,9 +39,8 @@
notice.setQuesContents(noList.getAnswer());
sysS.add(notice);
});
- notices.setSysS(sysS);
}
- return notices;
+ return sysS;
}
--
Gitblit v1.7.1