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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -217,7 +217,6 @@
   

   public long countQueryEverydayRob(BigDecimal zkPrice, BigDecimal minQuanPrice, BigDecimal maxQuanPrice);

   

	
   /**

    * 首页推荐

    * @param start

@@ -225,5 +224,5 @@
    * @param proportion

    * @return

    */

   public JSONArray getRecommendToIndexV2(long start, int count);

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

}