milestone0 merge master

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

@@ -179,6 +179,7 @@ public class RankStrategy4RegionMergeModelV1 extends RankService {
         }
         return data;
     }
+
     public List<Double> getStaticData(Map<String, Map<String, Double>> itemRealMap,
                                       List<String> datehours, String key){
         List<Double> views = new LinkedList<>();