Merge remote-tracking branch 'origin/div' into div

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/recommend/HomeRecommendGoodsServiceImpl.java

@@ -138,7 +138,7 @@
      if (fList != null && fList.size() > 0)

         return fList;



      TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(1, 50, imei, idfa);

      TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(1, 50, imei, idfa,"");

      List<TaoBaoGoodsBrief> finalList = new ArrayList<>();



      if (result != null && result.getTaoBaoGoodsBriefs() != null) {