Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
renzhiyuan 2024-11-28 11:21:07 +08:00
commit 7efbeb06fa
1 changed files with 2 additions and 1 deletions

View File

@ -6,6 +6,7 @@ import (
"cron_admin/app/http/entities/backend" "cron_admin/app/http/entities/backend"
"cron_admin/app/models/cronusermodel" "cron_admin/app/models/cronusermodel"
"cron_admin/app/services" "cron_admin/app/services"
userServices "cron_admin/app/services/user_service"
"cron_admin/app/utils/helper" "cron_admin/app/utils/helper"
"cron_admin/app/utils/mapstructure" "cron_admin/app/utils/mapstructure"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
@ -35,7 +36,7 @@ func CronReportLogsList(c *gin.Context) {
} }
} }
} }
_, userList, err := services.GetListByWhere(&backend.UserListRequest{UserIds: userIds}, 1, 100) _, userList, err := userServices.GetListByWhere(&backend.UserListRequest{UserIds: userIds}, 1, 100)
if err != nil { if err != nil {
return return
} }