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

admin

2020-03-15 b16f2b0126281e87346db9e6efd1db960ecc872a

 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java

@@ -218,10 +218,11 @@
   public long countQueryEverydayRob(BigDecimal zkPrice, BigDecimal minQuanPrice, BigDecimal maxQuanPrice);

   

   /**

    * 
    * 首页推荐

    * @param start

    * @param count

    * @param proportion

    * @return

    */

   public JSONArray getRecommendToIndexV2(long start, int count);

   public JSONArray getRecommendToIndexV2(long start, int count,String platform,String version);

}