Merge remote-tracking branch 'origin/master'

Administrator

2018-12-18 d146e7bca73c7605af6b718b5df0b757e0034f0e

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