Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop

src/controllers/SalaryPeriodController.ts

@@ -785,6 +785,7 @@ export class SalaryPeriodController extends Controller {
         }),
       )
       .orderBy("profile.citizenId", "ASC")
+      .addOrderBy("profile.isReserve", "ASC")
       .skip((body.page - 1) * body.pageSize)
       .take(body.pageSize)
       .getManyAndCount();