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

admin

2019-08-02 90b211c63f9d596aa90b508f76eb916a30b68731

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

@@ -252,7 +252,10 @@
         // 不能包含详情页

         String skuId = JDUtil.parseJDSkuIdByUrl(url);

         if (StringUtil.isNullOrEmpty(skuId))// 不能拦截详情页面，防止前端进入死循环

            data.put("goodsDetail", true);

            if (url.startsWith("https://union-click.jd.com/jdc?"))

               data.put("goodsDetail", false);

            else

               data.put("goodsDetail", true);

         else

            data.put("goodsDetail", false);