Merge branch 'master' into feature/zhangbo_model

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV999.java

@@ -314,8 +314,8 @@ public class RankStrategy4RegionMergeModelV999 extends RankStrategy4RegionMergeM
             video.setAllFeatureMap(item.getAllFeatureMap());
             if (feature != null
                     && MapUtils.isNotEmpty(feature.getVideoFeature())
-                    && MapUtils.isNotEmpty(feature.getVideoFeature().get(item.getVideoId()))) {
-                video.getMetaFeatureMap().putAll(feature.getVideoFeature().get(item.getVideoId()));
+                    && MapUtils.isNotEmpty(feature.getVideoFeature().get(item.getVideoId() + ""))) {
+                video.getMetaFeatureMap().putAll(feature.getVideoFeature().get(item.getVideoId() + ""));
             }
             if (feature != null
                     && MapUtils.isNotEmpty(feature.getUserFeature())) {