Merge branch 'anandadev' into develop

src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue

@@ -204,7 +204,10 @@
               <CurrencyInput
                 v-model="salary"
                 :edit="edit"
-                :options="{ currency: 'THB' }"
+                :options="{
+                  currency: 'THB',
+                }"
+                :label="`${'เงินเดือน'}`"
               />
             </div>
           </div>
@@ -294,7 +297,7 @@ import { onMounted, ref } from "vue";
 import { useQuasar } from "quasar";
 import { useRoute, useRouter } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
-import CurrencyInput from "@/modules/06_retirement/components/CurrencyInput.vue";
+import CurrencyInput from "@/components/CurruncyInput.vue";
 
 import http from "@/plugins/http";
 import config from "@/app.config";