Merge branch 'refs/heads/feature/20250627-dnn-score-strategy' into pre-master

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

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

@@ -270,8 +270,12 @@ public class RankStrategyBy688 extends RankStrategyBasic {
                 Map<String, String> b3Feature = cidFeature.getOrDefault("alg_cid_feature_cid_action", new HashMap<>());
                 double view = Double.parseDouble(b3Feature.getOrDefault("ad_view_14d", "0"));
                 double conver = Double.parseDouble(b3Feature.getOrDefault("ad_conversion_14d", "0"));
-                calibratedScore = NumUtil.divSmoothV2(conver, view, CTCVR_SMOOTH_BETA_FACTOR);
+                double smoothCxr = NumUtil.divSmoothV1(conver, view, 1.64);
+                if (smoothCxr < calibratedScore) {
+                    calibratedScore = smoothCxr;
+                }
                 log.info("not cid view={}, conver={}, calibratedScore={}, cid={}", view, conver, calibratedScore, item.getAdId());
+
             }
             item.setLrScore(calibratedScore);
             item.getScoreMap().put("originCtcvrScore", originalScore);