Merge branch 'master' into fly

wangpengfei

2023-08-02 b4201a0054369a8cd89e940947fd6f1a89f357c2

 api/v1/serviceContract.go

@@ -164,7 +164,7 @@
      return
   }

   serviceContracts, errCode := serviceContractService.GetServiceContractList(params.Page, params.PageSize, params.Keyword)
   serviceContracts, total, errCode := serviceContractService.GetServiceContractList(params.Page, params.PageSize, params.Keyword)
   if errCode != ecode.OK {
      ctx.Fail(errCode)
      return
@@ -172,6 +172,6 @@

   ctx.OkWithDetailed(response.ServiceContractsResponse{
      List:  serviceContracts,
      Count: len(serviceContracts),
      Count: int(total),
   })
}
}