Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts: internal/api/auth.go internal/api/route.go internal/api/user.go internal/rpc/third/third.go
This commit is contained in:
Conflicts: internal/api/auth.go internal/api/route.go internal/api/user.go internal/rpc/third/third.go