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

@@ -382,7 +382,7 @@ public abstract class RankStrategyBasic implements RankStrategy {
                 }
                 log.info("getCorrectCpaParamMap cid={}, jsonObject={}", adPlatformCreativeDTO.getCreativeId(), jsonObject);
                 CorrectCpaParam correctCpaParam = new CorrectCpaParam();
-                Integer views = jsonObject.getInteger("views");
+                Integer views = jsonObject.getInteger("viewsHour");
                 Double realCtcvrHour = jsonObject.getDouble("realCtcvrHour");
                 Double pCtcvrHour = jsonObject.getDouble("pCtcvrHour");
                 Double realCtcvrDay = jsonObject.getDouble("realCtcvrDay");