丁云鹏 1 éve
szülő
commit
7c42e1b092

+ 8 - 0
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/RecommendService.java

@@ -180,11 +180,19 @@ public class RecommendService {
                 map.put("mid", param.getMid());
 
                 // ab
+<<<<<<< HEAD
                 map.put("newexpgroup", request.getNewExpGroup());
 
                 // scene
                 map.put("apptype", String.valueOf(request.getAppType()));
                 map.put("pagesource", request.getPageSource());
+=======
+                map.put("newexpgroup", String.valueOf(request.getNewExpGroup()));
+                // scene
+                map.put("apptype", String.valueOf(request.getAppType()));
+
+                map.put("pagesource", String.valueOf(request.getPageSource()));
+>>>>>>> a17d96f (log score)
 
                 // video
                 map.put("videoId", String.valueOf(v.getVideoId()));