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

# Conflicts:
#	pkg/common/constant/constant.go
This commit is contained in:
wangchuxiao
2022-04-18 19:26:26 +08:00
33 changed files with 3972 additions and 546 deletions
+5 -2
View File
@@ -81,6 +81,7 @@ const (
GroupMemberCancelMutedNotification = 1513
GroupMutedNotification = 1514
GroupCancelMutedNotification = 1515
GroupMemberInfoSetNotification = 1516
SignalingNotificationBegin = 1600
SignalingNotification = 1601
@@ -88,8 +89,10 @@ const (
ConversationPrivateChatNotification = 1701
WorkMomentNotificationStart = 1800
WorkMomentNewCommentNotification = 1801
OrganizationChangedNotification = 1801
WorkMomentNotificationStart = 1900
WorkMomentNewCommentNotification = 1901
NotificationEnd = 2000