waruneeauy 563f3e1b16 Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into develop ... # Conflicts: # src/modules/03_recruiting/components/Address.vue # src/modules/03_recruiting/views/03_editor/index.vue # src/modules/04_registryPerson/components/Dialog/02_Address.vue # src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue # src/modules/05_placement/components/PersonalDetail/CheckInformation/02_FormAddress.vue # src/modules/05_placement/components/PersonalDetail/Information/Address.vue		2024-11-27 18:18:21 +07:00
..
00_support	remove keycloak use cookie auth	2024-08-28 15:29:09 +07:00
01_masterdata	updated	2024-11-27 18:13:26 +07:00
02_organization	no message	2024-11-26 16:11:02 +07:00
03_recruiting	Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into develop	2024-11-27 18:18:21 +07:00
04_registryPerson	Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into develop	2024-11-27 18:18:21 +07:00
05_placement	updated	2024-11-27 18:13:26 +07:00
06_retirement	fix bug	2024-11-26 17:07:53 +07:00
07_insignia	ปรับ UI	2024-11-22 18:04:12 +07:00
08_registryEmployee	ปรับ UI	2024-11-22 18:04:12 +07:00
09_leave	fix bug รายการลงเวลากรณีพิเศษ	2024-11-26 11:32:48 +07:00
11_discipline	ปรับ UI	2024-11-22 18:04:12 +07:00
12_evaluatePersonal	ปรับ UI	2024-11-22 18:04:12 +07:00
13_salary	updated	2024-11-27 18:13:26 +07:00
14_KPI	Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into develop	2024-11-27 18:18:21 +07:00
15_development	Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into develop	2024-11-27 18:18:21 +07:00
16_positionEmployee	fix report โครงสร้าง ลูกจ้าง	2024-11-20 17:21:35 +07:00
17_acting	แก้รักษาการ	2024-11-05 15:11:36 +07:00
18_command	updated	2024-11-27 18:13:26 +07:00
19_condition	โครงสร้าง	2024-11-21 12:48:12 +07:00