Merge remote-tracking branch 'origin/master'

yujian

2019-01-28 7bce608e9006c95bf15fb8c8c487c905c1599bd2

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

@@ -169,7 +169,7 @@
    * @param proportion  计算比例

    * @return

    */

   public JSONArray  getRecommendToIndex(long start, int count, String proportion, String fcRate);

   public JSONArray  getRecommendToIndex(long start, int count, String proportion);

   

   public long countRecommendToIndex(String proportion);