diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java index 75a761900..261948a69 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java @@ -342,11 +342,7 @@ public class GuildChallengeLogic { otherIndication.setIsRefresh(1);//需要前端刷新次数 } if(isession!=null){ -<<<<<<< HEAD LOGGER.info("向{}发送indication",sendUid); -======= -// LOGGER.info("向{}发送indication",sendUid); ->>>>>>> master_online_gn MessageUtil.sendIndicationMessage(isession,1,MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION_VALUE,otherIndication.build(),true); } }