Merge branch 'develop' into adiDev

2025-01-21 13:16:24 +07:00 · 2025-01-21 13:16:24 +07:00 · 9646659f4c
commit 9646659f4c
parent e4403e507f e9aabfa83a
8 changed files with 411 additions and 99 deletions
--- a/src/controllers/KpiCapacityController.ts
+++ b/src/controllers/KpiCapacityController.ts
@ -211,6 +211,7 @@ export class kpiCapacityController extends Controller {
      },
      select: ["id", "name"],
      relations: ["kpiCapacityDetails"],
+      order: { createdAt: "ASC" },
    });

    const mapData = kpiCapacity.map((x) => ({