Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 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)));