From 9c2489c0c360c8dda36d3cbe1dba79222096b2dd Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 07 八月 2023 10:16:39 +0800
Subject: [PATCH] Merge branch 'master' into fly

---
 api/v1/serviceContract.go |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/api/v1/serviceContract.go b/api/v1/serviceContract.go
index 136c362..38b78f2 100644
--- a/api/v1/serviceContract.go
+++ b/api/v1/serviceContract.go
@@ -150,12 +150,12 @@
 
 // List
 //
-//	@Tags		ServiceContract
-//	@Summary	鐢熸垚璁″垝鍒楄〃
-//	@Produce	application/json
-//	@Param		object	body		request.GetServiceContractList	true	"鍙傛暟"
-//	@Success	200		{object}	contextx.Response{data=response.ServiceContractsResponse}
-//	@Router		/api/serviceContract/list [post]
+// @Tags		ServiceContract
+// @Summary	鐢熸垚璁″垝鍒楄〃
+// @Produce	application/json
+// @Param		object	body		request.GetServiceContractList	true	"鍙傛暟"
+// @Success	200		{object}	contextx.Response{data=response.ServiceContractsResponse}
+// @Router		/api/serviceContract/list [post]
 func (con *ServiceContractApi) List(c *gin.Context) {
 	var params request.GetServiceContractList
 	ctx, ok := contextx.NewContext(c, &params)
@@ -163,7 +163,7 @@
 		return
 	}
 
-	serviceContracts, total, errCode := serviceContractService.GetServiceContractList(params.Page, params.PageSize, params.Keyword)
+	serviceContracts, total, errCode := serviceContractService.GetServiceContractList(params.Page, params.PageSize, params.QueryClass, params.KeywordType, params.Keyword)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return

--
Gitblit v1.8.0