Merge branch 'develop' into adiDev
This commit is contained in:
commit
289216089c
2 changed files with 2 additions and 0 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue