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

yujian

2020-04-18 bb133d1e82c337da646e90740b82584b82f9a0e6

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

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

    * @return

    */

   public JSONArray getRecommendToIndexV2(long start, int count);

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

}