From 2493985a5bdfc6496381b39de0f9713b79c2e51d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 25 十一月 2023 11:14:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/controller/ExploreWPController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/ExploreWPController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/ExploreWPController.java
index 07ccdea..2f09f2a 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/ExploreWPController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/ExploreWPController.java
@@ -73,7 +73,8 @@
@ApiOperation(value = "联系客服-常见问题列表", tags = {"APP-探索玩湃"})
public ResultUtil<List<QuestionIns>> queryFrequentlyAskedQuestionDetails(){
try {
- return ResultUtil.success(tsService.queryQuestionData());
+ List<QuestionIns> questionIns = tsService.queryQuestionData();
+ return ResultUtil.success(questionIns);
}catch (Exception e){
return ResultUtil.runErr();
}
@@ -117,11 +118,11 @@
@ApiImplicitParam(value = "搜索", name = "search", required = true, dataType = "string"),
})
public ResultUtil<List<StoreDetailList>> getStoreListCon(Integer space,String cityCode,String latitude,String longitude,String search){
- try {
- return ResultUtil.success(tsService.queryStoreList(space,cityCode,latitude,longitude,search));
- }catch (Exception e){
- return ResultUtil.runErr();
- }
+// try {
+ return ResultUtil.success(tsService.queryStoreList(space,cityCode,longitude,latitude,search));
+// }catch (Exception e){
+// return ResultUtil.runErr();
+// }
}
--
Gitblit v1.7.1