fix: merge conflicts

This commit is contained in:
withchao
2025-05-16 14:31:50 +08:00
parent b40bc731e6
commit 8e7457febb
5 changed files with 44 additions and 62 deletions
+1
View File
@@ -136,6 +136,7 @@ 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 {