Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun

# Conflicts:
#	internal/rpc/msg/rpcChat.go
This commit is contained in:
wangchuxiao
2022-05-25 15:58:06 +08:00
6 changed files with 365 additions and 287 deletions
+2 -2
View File
@@ -46,8 +46,8 @@ const (
GroupMsg = 201
//SysRelated
NotificationBegin = 1000
NotificationBegin = 1000
DeleteMessageNotification = 1100
FriendApplicationApprovedNotification = 1201 //add_friend_response
FriendApplicationRejectedNotification = 1202 //add_friend_response
FriendApplicationNotification = 1203 //add_friend