Merge branch 'develop'

This commit is contained in:
Methapon2001 2025-06-30 14:05:46 +07:00
commit 96bdb86c73

View file

@ -370,7 +370,7 @@ export class BranchController extends Controller {
bank: true, bank: true,
contact: includeContact, contact: includeContact,
}, },
orderBy: { code: "asc" }, orderBy: [{ statusOrder: "asc" }, { code: "asc" }],
}, },
bank: true, bank: true,
contact: includeContact, contact: includeContact,