Merge remote-tracking branch 'origin/master'

admin

2019-05-14 aa784ab65cc24caf45a4c38af7e5fdeb526eb393

 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java

@@ -2069,7 +2069,7 @@
         goodsJson.put("shopInfo", tbShopInfo);

      }



      goodsJson.put("fanliValid", true);// 是否有返利

      goodsJson.put("fanliValid",Math.random()>0.5? true:false);// 是否有返利



      // 分享路径

      String shareUrl = String.format("%s?id=" + tb.getAuctionId(), Constant.systemCommonConfig.getAppShareInfoUrl());