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

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

Browse Source 
 Conflicts:
	internal/rpc/group/group.go
	pkg/common/db/relation/user_model_k.go
This commit is contained in:
wangchuxiao
2023-01-30 11:12:35 +08:00
parent 21a1e7dff2 2a76dc3ac8
commit 5b8f66404c
14 changed files with 1313 additions and 1438 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/utils/convert.go
+1 -1
View File
@@ -281,7 +281,7 @@ func (pb *PBUser) Convert() (*relation.User, error) {
func (db *DBUser) Convert() (*sdk.UserInfo, error) {
dst := &sdk.UserInfo{}
utils.CopyStructFields(dst, db)
dst.CreateTime = uint32(db.CreateTime.Unix())
dst.CreateTime = db.CreateTime.Unix()
dst.Birthday = db.Birth.Unix()
return dst, nil
}