Merge branch 'dev-xym-add-feature' 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

@@ -562,7 +562,7 @@ public class RankStrategyBy688 extends RankStrategyBasic {
                                       Map<String, Map<String, String>> adVerFeature,
                                       Map<String, String> cidFeatureMap) {
         Map<String, String> h1Feature = adVerFeature.getOrDefault("alg_mid_feature_adver_action", new HashMap<>());
-        Map<String, String> h2Feature = adVerFeature.getOrDefault("alg_mid_feature_sku_action", new HashMap<>());
+        Map<String, String> h2Feature = cidFeature.getOrDefault("alg_mid_feature_sku_action", new HashMap<>());
         log.info("h1Feature={}",h1Feature);
         log.info("h2Feature={}",h2Feature);
         List<String> timeList = Arrays.asList("3d", "7d", "30d");