Merge branch 'develop' into dev

* develop: ปิดไม่แสดงข้อมูลตำแหน่งและเงินเดือน
2026-01-27 16:46:11 +07:00 · 2026-01-27 16:46:11 +07:00 · d009c17e07
commit d009c17e07
parent 2cef4b4a2f f89857e6cc
2 changed files with 2 additions and 2 deletions
--- a/src/modules/10_registry/tabs/02_government.vue
+++ b/src/modules/10_registry/tabs/02_government.vue
@ -31,7 +31,7 @@ const router = useRouter();

  <div :class="`row q-my-sm ${$q.screen.gt.xs ? '' : 'mobileClass'}`">
    <Government />
-    <Position />
+    <!-- <Position /> -->
    <Actposition />
    <Assistance />
    <Discipline />
--- 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>