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

Browse Source

 Conflicts:

	internal/api/group/group.go

	internal/api/group/super_group.go

	pkg/common/db/controller/user.go

...

This commit is contained in:

wangchuxiao

2023-02-09 14:49:17 +08:00

parent 414915eb3b 2f7b65730a

commit 1075754458

19 changed files with 1776 additions and 1681 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

internal/api/group/group.go

+1265 -1265

File diff suppressed because it is too large Load Diff