IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-14 22:15:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/errcode' into errcode

Browse Source 
# Conflicts:
#	go.mod
#	pkg/common/db/controller/user.go
This commit is contained in:
skiffer-git
2023-02-09 10:59:32 +08:00
parent 9a7ed2d24d 62f0d1043d
commit ac284b696a
24 changed files with 553 additions and 834 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/rpc/user/user.go
+2 -2
View File
@@ -7,7 +7,7 @@ import (
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/db/controller"
"Open_IM/pkg/common/db/relation"
relation2 "Open_IM/pkg/common/db/table/relation"
relationTb "Open_IM/pkg/common/db/table/relation"
"Open_IM/pkg/common/log"
promePkg "Open_IM/pkg/common/prometheus"
"Open_IM/pkg/common/token_verify"
@@ -195,7 +195,7 @@ func (s *userServer) UpdateUserInfo(ctx context.Context, req *pbUser.UpdateUserI
if err != nil {
return nil, err
}
err = s.Update(ctx, []*relation2.UserModel{user})
err = s.Update(ctx, []*relationTb.UserModel{user})
if err != nil {
return nil, err
}