Merge branch 'master' into 0830

@@ -144,6 +144,8 @@ public class FunctionScoreSearchHelper {
         scorers.add(searchScorerFactory.getOfflineSaleOnlyScorer());
         // 6、添加特殊店铺的打分器
         scorers.add(searchScorerFactory.getSpecialShopScorer(SpecialShopConstants.DOWNGRADE_SHOPIDS, SpecialShopConstants.DOWNGRADE_SHOP_WEIGHT));
+        // 7、基于向量的个性化打分
+        scorers.add(this.getPersonalVectorFeatureScorer(persionalFilter, paramMap));
         return scorers;
     }
 
@@ -191,8 +193,6 @@ public class FunctionScoreSearchHelper {
         scorers.add(searchScorerFactory.getFirstProductSknScorer(paramMap));
         // 5、断码商品
         //scorers.add(searchScorerFactory.getBreakSizeProductScorer(paramMap));
-        // 6、基于向量的个性化打分
-        //scorers.add(this.getPersonalVectorFeatureScorer(persionalFilter, paramMap));
         return scorers;
     }