Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me

# Conflicts: # src/modules/04_registry/components/Profile.vue
2023-08-21 12:22:04 +07:00 · 2023-08-21 12:22:04 +07:00 · 380c628099
commit 380c628099
parent 98156c072b fd1f5ce8e4
11 changed files with 328 additions and 440 deletions
--- a/src/modules/04_registry/components/Profile.vue
+++ b/src/modules/04_registry/components/Profile.vue
@ -495,7 +495,7 @@
                dense
                outlined
                v-model="reasonDeath"
-                label="เหตุผลการเสีบชีวิต"
+                label="เหตุผลการเสียชีวิต"
                type="textarea"
              />
            </div>