feat: 获取用户信息添加多个字段

CloudStriver · Mar 30, 2024 · 51b1024 · 51b1024
1 parent b205245
commit 51b1024
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/biz/application/service/relation.go b/biz/application/service/relation.go
@@ -254,7 +254,6 @@ func (s *RelationService) CreateRelation(ctx context.Context, req *core_api.Crea
 	if req.ToId == user.GetUserId() {
 		return resp, nil
 	}
-<<<<<<< HEAD
 
 	switch req.ToType {
 	case core_api.TargetType_UserType:
@@ -281,8 +280,6 @@ func (s *RelationService) CreateRelation(ctx context.Context, req *core_api.Crea
 		userId = getPostResp.UserId
 	}
 
-=======
->>>>>>> 9caf2e178b07c3b9b7d518563ccf8a1070da6b6e
 	userinfo, err := s.CloudMindContent.GetUser(ctx, &content.GetUserReq{
 		UserId: user.UserId,
 	})

diff --git a/biz/application/service/user.go b/biz/application/service/user.go
@@ -199,7 +199,7 @@ func (s *UserService) GetUserDetail(ctx context.Context, _ *core_api.GetUserDeta
 		Flow:        getBalanceResp.Flow,
 		Momery:      getBalanceResp.Memory,
 		Point:       getBalanceResp.Point,
-		Labels:      getUserResp.Labels,
+		Tags:        getUserResp.Labels,
 		CreateTime:  getUserResp.CreateTime,
 	}, nil
 }