From eb65f4c3c6903b11424eeaefe46653acedf24448 Mon Sep 17 00:00:00 2001 From: wangpengfei <274878379@qq.com> Date: 星期二, 08 八月 2023 09:40:22 +0800 Subject: [PATCH] Merge branch 'master' into fly --- service/saleChance.go | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/service/saleChance.go b/service/saleChance.go index 03b01c3..4c42d23 100644 --- a/service/saleChance.go +++ b/service/saleChance.go @@ -54,11 +54,11 @@ return ecode.OK } -func (SaleChanceService) GetSaleChanceList(page, pageSize int, keyword string) ([]*model.SaleChance, int) { +func (SaleChanceService) GetSaleChanceList(page, pageSize int, keyword string) ([]*model.SaleChance, int64, int) { // get contact list - contacts, err := model.NewSaleChanceSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll() + contacts, total, err := model.NewSaleChanceSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll() if err != nil { - return nil, ecode.SaleChanceListErr + return nil, 0, ecode.SaleChanceListErr } - return contacts, ecode.OK + return contacts, total, ecode.OK } -- Gitblit v1.8.0