Merge branch 'develop' into dev

Merge branch 'develop' of https://github.com/Frappet/BMA-EHR-USER into develop
refactor(registry): show salary data
2026-06-30 11:15:43 +07:00 · 2026-06-30 11:08:59 +07:00 · 2026-06-30 11:08:33 +07:00
1 changed files with 1 additions and 1 deletions
--- a/src/modules/10_registry/tabs/03_salary.vue
+++ b/src/modules/10_registry/tabs/03_salary.vue
@ -25,7 +25,7 @@ const router = useRouter();
  </div>

  <div :class="`row q-my-sm ${$q.screen.gt.xs ? '' : 'mobileClass'}`">
-    <!-- <Salary /> -->
+    <Salary />
    <Nopaid />
  </div>
 </template>
Author	SHA1	Message	Date
$DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490	0757de98ba	Merge branch 'develop' into dev Some checks failed Build & Deploy on Dev / build (push) Failing after 1m4s Details	2026-06-30 11:15:43 +07:00
$DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490	f5234ba06a	Merge branch 'develop' of https://github.com/Frappet/BMA-EHR-USER into develop	2026-06-30 11:08:59 +07:00
$DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490	8f74412128	refactor(registry): show salary data	2026-06-30 11:08:33 +07:00