Merge branch 'develop' into devTee

# Conflicts:
#	src/modules/18_command/components/DialogCreateCommandORG.vue
This commit is contained in:
setthawutttty 2024-10-21 13:54:57 +07:00
commit 1b6bb495a5
10 changed files with 317 additions and 247 deletions

View file

@ -630,7 +630,7 @@ onMounted(() => {
v-model:is-officer="storeActing.isOfficer as boolean"
v-model:is-staff="storeActing.isStaff as boolean"
v-model:root-id="storeActing.rootId"
:system-name="'acting'"
:system-name="'ACTING'"
/>
</template>