更新gf版本到v2.2.5

This commit is contained in:
孟帅
2022-12-11 20:48:18 +08:00
parent e990ce28a1
commit 6b3333340f
41 changed files with 470 additions and 613 deletions

View File

@@ -293,7 +293,7 @@ func (s *sSysLog) Delete(ctx context.Context, in sysin.LogDeleteInp) error {
}
// List 列表
func (s *sSysLog) List(ctx context.Context, in sysin.LogListInp) (list []*sysin.LogListModel, totalCount int, err error) {
func (s *sSysLog) List(ctx context.Context, in sysin.LogListInp) (list []*sysin.LogListModel, totalCount int64, err error) {
mod := dao.SysLog.Ctx(ctx)
// 访问路径
@@ -353,7 +353,7 @@ func (s *sSysLog) List(ctx context.Context, in sysin.LogListInp) (list []*sysin.
return list, totalCount, err
}
if err = mod.Page(in.Page, in.PerPage).Order("id desc").Scan(&list); err != nil {
if err = mod.Page(int(in.Page), int(in.PerPage)).Order("id desc").Scan(&list); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
}