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

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

@@ -310,7 +310,9 @@ public abstract class RankStrategyBasic implements RankStrategy {
 
         String layer = userLayer.getOrDefault("layer", "无曝光");
         String clazz = userLayer.getOrDefault("class", "近期未出现");
-
+        if (StringUtils.isNotEmpty(layer) && layer.contains("已转化")) {
+            layer = "有转化";
+        }
         if (request.getIsFilterUser()) {
             layer = layer + "-炸";
         }