Merge branch 'develop' of github.com:Frappet/BMA-EHR-USER into develop

# Conflicts:
#	src/modules/09_scholarship/views/main.vue
This commit is contained in:
Warunee Tamkoo 2024-11-06 09:32:27 +07:00
commit 864815ef12
31 changed files with 59 additions and 54 deletions

View file

@ -237,8 +237,6 @@ onMounted(async () => {
map-options
:options="columns"
option-value="name"
options-cover
style="min-width: 140px"
class="col-xs-12 col-md-1"
/>
</div>