From 5fb6b3adb9ff0bf9c1f8c13c2f4f4318c8d62e3c Mon Sep 17 00:00:00 2001
From: withchao <993506633@qq.com>
Date: Fri, 16 May 2025 14:42:16 +0800
Subject: [PATCH] fix: merge conflicts

---
 internal/rpc/user/user.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go
index 0b9d68c56..7f082f784 100644
--- a/internal/rpc/user/user.go
+++ b/internal/rpc/user/user.go
@@ -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 {