Merge branch 'dev' of GameCenter/game-center into master

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/RoleManageServiceImpl.java

@@ -2919,10 +2919,11 @@ public class RoleManageServiceImpl implements IRoleManageService {
                         SELECT
                             role_chat_count,
                             super_game_id,
-                            source_system
+                            source_system,
+                            role_id
                         FROM game_ads.ads_role_chat
                         where dt = DATE_FORMAT(NOW() - INTERVAL 1 DAY, '%Y-%m-%d')
-                    ) z ON z.super_game_id = d.super_game_id and  z.source_system = d.source_system 
+                    ) z ON z.super_game_id = d.super_game_id and  z.source_system = d.source_system  and a.role_id = z.role_id
                 ) a
                 """ + criA;
     }