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

admin

2020-03-24 93d7b02fdeda2cd14502ba4dcfd2a0168f597a26

 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);

}