Merge branch 'develop'

2025-06-30 14:05:46 +07:00 · 2025-06-30 14:05:46 +07:00 · 96bdb86c73
commit 96bdb86c73
parent 5262ad2a63 7bd685ea96
1 changed files with 1 additions and 1 deletions
--- a/src/controllers/01-branch-controller.ts
+++ b/src/controllers/01-branch-controller.ts
@ -370,7 +370,7 @@ export class BranchController extends Controller {
            bank: true,
            contact: includeContact,
          },
-          orderBy: { code: "asc" },
+          orderBy: [{ statusOrder: "asc" }, { code: "asc" }],
        },
        bank: true,
        contact: includeContact,