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

# Conflicts:
#	config/config.yaml
This commit is contained in:
Gordon
2022-02-24 18:14:25 +08:00
5 changed files with 62 additions and 54 deletions
+1
View File
@@ -746,6 +746,7 @@ func (s *groupServer) GetGroups(_ context.Context, req *pbGroup.GetGroupsReq) (*
OwnerUserID: v.CreatorUserID,
Status: v.Status,
CreatorUserID: v.CreatorUserID,
CreateTime: uint32(v.CreateTime.Unix()),
},
GroupMasterId: groupMember.UserID,
GroupMasterName: groupMember.Nickname,