Merge branch 'refs/heads/dev-xym-filter-and-ecpm' into pre-master

# Conflicts:
#	ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/strategy/RankStrategyBasic.java

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/strategy/RankStrategyBasic.java

@@ -571,7 +571,7 @@ public abstract class RankStrategyBasic implements RankStrategy {
             }
 
             double realCtcvr = Optional.ofNullable(param.getRealCtcvr()).orElse(0.0);
-            double calibratedScore = alpha * item.getLrScore() + (1 - alpha) * realCtcvr;
+            double calibratedScore = item.getLrScore() * calibrationAlpha + (1 - calibrationAlpha) * realCtcvr;
             item.getExt().put("correctCtcvrScoreParam", JSONObject.toJSONString(param));
             item.getScoreMap().put("lrScore()", item.getLrScore());
             item.getScoreMap().put("ctcvrScore", calibratedScore);