冲突修改
parent
d080a9a0d8
commit
e39ac0cd61
|
@ -342,11 +342,7 @@ public class GuildChallengeLogic {
|
||||||
otherIndication.setIsRefresh(1);//需要前端刷新次数
|
otherIndication.setIsRefresh(1);//需要前端刷新次数
|
||||||
}
|
}
|
||||||
if(isession!=null){
|
if(isession!=null){
|
||||||
<<<<<<< HEAD
|
|
||||||
LOGGER.info("向{}发送indication",sendUid);
|
LOGGER.info("向{}发送indication",sendUid);
|
||||||
=======
|
|
||||||
// LOGGER.info("向{}发送indication",sendUid);
|
|
||||||
>>>>>>> master_online_gn
|
|
||||||
MessageUtil.sendIndicationMessage(isession,1,MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION_VALUE,otherIndication.build(),true);
|
MessageUtil.sendIndicationMessage(isession,1,MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION_VALUE,otherIndication.build(),true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue