Merge branch 'main-merge-base-a'

# Conflicts:
#	deploy/dev/docker-compose.yml
#	deploy/dev/envoy.yaml
#	desc/api/dispute.api
#	desc/api/review.api
#	desc/api/search.api
This commit is contained in:
zetaloop
2026-04-25 05:42:42 +08:00
231 changed files with 34629 additions and 44 deletions
@@ -45,7 +45,7 @@ func (l *UpdatePlayerServicesLogic) UpdatePlayerServices(in *pb.UpdatePlayerServ
_, err := update.Save(l.ctx)
if err != nil {
logx.Errorf("failed to update player services: " + err.Error())
logx.Errorf("failed to update player services: %v", err)
return nil, errors.New("failed to update player services")
}
return &pb.UpdatePlayerServicesResp{}, nil