fix : 代码合并解决冲突代码提交

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/AgentServiceImpl.java

@@ -101,14 +101,14 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent>
         Map<Long, UserActionSetRpcVO> userActionSetMap = new HashMap<>(0);
         if (CollectionUtils.isNotEmpty(txAccountIds)) {
             for (Long txAccountId : txAccountIds) {
-                userActionSetMap = userActionSetRpc.getByAccount(txAccountId).getData();
+//                userActionSetMap = userActionSetRpc.getByAccount(txAccountId).getData();
             }
         }
         Map<Long, GameInfoVO> gameMap = gameService.infoByIds(gameIds).stream().collect(Collectors.toMap(GameInfoVO::getId, Function.identity()));
         return agentList.stream().map(agent -> {
             AgentVO vo = BeanUtil.copy(agent, AgentVO.class);
             vo.setGameInfo(gameMap.get(agent.getGameId()));
-            vo.setUserActionSet();
+//            vo.setUserActionSet();
             return vo;
         }).collect(Collectors.toList());