Merge branch 'develop' into adiDev

This commit is contained in:
AdisakKanthawilang 2024-04-22 10:23:56 +07:00
commit 289216089c
2 changed files with 2 additions and 0 deletions

View file

@ -303,6 +303,7 @@ export class kpiPlanController extends Controller {
"kpiPeriod.durationKPI",
"kpiPlan.including",
"kpiPlan.includingName",
"kpiPlan.createdAt",
])
.orderBy("kpiPlan.createdAt", "DESC")
.skip((page - 1) * pageSize)

View file

@ -251,6 +251,7 @@ export class kpiRoleController extends Controller {
"kpiPeriod.durationKPI",
"kpiRole.including",
"kpiRole.includingName",
"kpiRole.createdAt",
])
.orderBy("kpiRole.createdAt", "DESC")
.skip((page - 1) * pageSize)