Skip to content

A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.

fix

aichy71cdec7ec7eb
diff --git a/internal/controller/search_controller.go b/internal/controller/search_controller.go
index 79e5d536..1d135451 100644
--- a/internal/controller/search_controller.go
+++ b/internal/controller/search_controller.go
@@ -65,15 +65,10 @@ func (sc *SearchController) Search(ctx *gin.Context) {
}
}
-<<<<<<< HEAD
resp, total, err := sc.searchService.Search(ctx, &dto)
-
-=======
- resp, total, extra, err := sc.searchService.Search(ctx, &dto)
if !isAdmin {
sc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionSearch, unit)
}
->>>>>>> feat/1.1.1/ai
handler.HandleResponse(ctx, err, schema.SearchListResp{
Total: total,
SearchResp: resp,