mirror of
https://github.com/openimsdk/open-im-server.git
synced 2025-05-22 04:39:19 +08:00
fix: merge conflicts
This commit is contained in:
parent
8e7457febb
commit
5fb6b3adb9
@ -136,7 +136,6 @@ func Start(ctx context.Context, config *Config, client discovery.Conn, server gr
|
||||
}
|
||||
|
||||
func (s *userServer) GetDesignateUsers(ctx context.Context, req *pbuser.GetDesignateUsersReq) (resp *pbuser.GetDesignateUsersResp, err error) {
|
||||
return nil, errs.ErrRecordNotFound.WrapMsg("test error")
|
||||
resp = &pbuser.GetDesignateUsersResp{}
|
||||
users, err := s.db.Find(ctx, req.UserIDs)
|
||||
if err != nil {
|
||||
|
Loading…
x
Reference in New Issue
Block a user