Merge remote-tracking branch 'origin/master'

This commit is contained in:
Him188 2020-04-11 16:08:01 +08:00
commit 1e93da9a09

View File

@ -551,7 +551,7 @@ data class NewFriendRequestEvent(
*/ */
val eventId: Long, val eventId: Long,
/** /**
* 入群申请消息 * 申请好友消息
*/ */
val message: String, val message: String,
/** /**
@ -594,7 +594,7 @@ data class NewFriendRequestEvent(
} }
/** /**
* 机器人被邀请加入群 * 一个账号请求加入群事件
*/ */
@SinceMirai("0.35.0") @SinceMirai("0.35.0")
data class MemberJoinRequestEvent( data class MemberJoinRequestEvent(