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

app/game/rpc/internal/logic/searchGamesLogic.go

@@ -26,7 +26,6 @@ func NewSearchGamesLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Searc
 }
 
 func (l *SearchGamesLogic) SearchGames(in *pb.SearchGamesReq) (*pb.SearchGamesResp, error) {
-	notFoundErr := entcache.ErrNotFound
 	if in.Limit <= 0 {
 		in.Limit = 20
 	}
@@ -37,7 +36,7 @@ func (l *SearchGamesLogic) SearchGames(in *pb.SearchGamesReq) (*pb.SearchGamesRe
 		in.Offset = 0
 	}
 	all, err := l.svcCtx.GameModelRO.Games.Query().Limit(int(in.Limit)).Offset(int(in.Offset)).All(l.ctx)
-	if err != nil && !errors.As(err, &notFoundErr) {
+	if err != nil && !errors.Is(err, entcache.ErrNotFound) {
 		logx.Errorf("failed to query games: %v", err)
 		return nil, errors.New("failed to query games")
 	}