From a8c566a3b274058fe31feaf8e980b2334b9bf83a Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期一, 22 七月 2019 14:22:12 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java index 609dee9..257ec87 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java @@ -482,7 +482,7 @@ listRecommendWords = new ArrayList<String>(); } - List<TaoBaoShopVO> listShop =null; //taoBaoShopService.getShopByKey(kw); + List<TaoBaoShopVO> listShop =taoBaoShopService.getShopByKey(kw); if (listShop != null && listShop.size() > 0 && listShop.get(0).getListGoods() != null && listShop.get(0).getListGoods().size() > 2) { data.put("shop", JsonUtil.getApiCommonGson().toJson(listShop.get(0))); -- Gitblit v1.8.0