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

yujian

2020-04-23 2bd2200f209ddb7bcc59b636d9de6f8b3f762958

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java

@@ -572,7 +572,7 @@
      // 淘宝api搜索商品

      TaoBaoSearchResult result = TaoBaoUtil.search(sf);



      // 搜索是否在营销主商品库

      // 搜索结果缓存到redis

      if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0) {

         ThreadUtil.run(new Runnable() {

            @Override