Commit graph

2033 commits

Author SHA1 Message Date
Bright
9d46cd2e78 fix bug ระบบทดลองปฏิบัติหน้าที่ราชการ #863 2024-12-18 17:14:30 +07:00
ce86d800a7 fix report 2024-12-18 13:26:51 +07:00
ff47f80495 Merge branch 'develop' into adiDev
# Conflicts:
#	src/controllers/CommandController.ts
2024-12-18 11:03:04 +07:00
42c9c8a8f5 cronjob admin token 2024-12-18 10:59:57 +07:00
kittapath
de2ee9b709 no message 2024-12-18 10:52:40 +07:00
4077900079 thai number 984(1) 2024-12-17 10:41:22 +07:00
f873f458f6 Merge branch 'develop' into adiDev 2024-12-16 17:41:20 +07:00
0338ba48d1 #857 (3) 2024-12-16 17:39:27 +07:00
kittapath
036b9e21a2 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2024-12-16 16:48:36 +07:00
kittapath
cbb4862deb แก้ไขชื่อ 2024-12-16 16:45:53 +07:00
Bright
abf540be98 fix issue #866 2024-12-16 16:00:50 +07:00
168a5ec53c Merge branch 'develop' into adiDev 2024-12-16 13:06:11 +07:00
ac263f25eb fix 2024-12-16 13:05:14 +07:00
kittapath
640668decb delete comment 2024-12-15 20:40:11 +07:00
kittapath
0c7c3361f6 api update profile amount 2024-12-14 12:00:45 +07:00
kittapath
2f5aef96f3 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2024-12-13 21:10:43 +07:00
kittapath
0d4c2e4124 send rootId 2024-12-13 21:10:32 +07:00
1e64f973f1 Merge branch 'develop' into adiDev 2024-12-13 17:56:05 +07:00
1623febe48 fix 2024-12-13 17:55:03 +07:00
kittapath
139cb542b0 add position 2024-12-13 17:42:32 +07:00
kittapath
a5809663c4 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2024-12-13 16:06:31 +07:00
kittapath
8dfb093a9e no message 2024-12-13 16:06:19 +07:00
94134355fa Merge branch 'develop' into adiDev 2024-12-13 15:48:08 +07:00
c499e13c97 fix age 2024-12-13 15:47:07 +07:00
kittapath
971fac10d1 แก้อนุมัติ 2024-12-13 10:25:52 +07:00
kittapath
ed1761ecba Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2024-12-12 18:29:26 +07:00
kittapath
5fc17c4808 no message 2024-12-12 18:29:04 +07:00
Bright
6768a265de fix issue #860 : ระบบทะเบียนประวัติ(ลูกจ้าง) เข้าแท็บเมนูข้อมูลข้าราชการ Error 2024-12-12 17:44:57 +07:00
Bright
942c88a961 fix issue #848 & #850 2024-12-12 16:32:31 +07:00
kittapath
1f0c6cb192 find profile by nodeId 2024-12-12 15:21:55 +07:00
kittapath
75e1d761b5 Merge branch 'develop' 2024-12-12 11:55:16 +07:00
kittapath
e723e7b36e Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2024-12-12 11:36:21 +07:00
kittapath
9abdeca45b no message 2024-12-12 11:36:11 +07:00
Bright
38844e1519 แก้ไขค้นหา issue #848, #850 2024-12-12 11:18:58 +07:00
kittapath
992a48b787 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2024-12-12 00:00:00 +07:00
kittapath
000d1d6260 no message 2024-12-11 23:59:49 +07:00
72b5f30fac fix 2024-12-11 17:19:41 +07:00
43b636b738 Merge branch 'adiDev' into develop 2024-12-11 17:15:12 +07:00
1b53b0ce9b #984(1) และ #830 2024-12-11 17:13:03 +07:00
Bright
826337c8d7 check commandType.isSalary 2024-12-10 16:03:40 +07:00
Suphonchai Phoonsawat
426239e8d8 Merge remote-tracking branch 'origin/develop' into develop 2024-12-10 12:48:40 +07:00
Bright
3aa636264a tab2 2024-12-10 12:06:15 +07:00
kittapath
bf0c30151a Merge branch 'develop' 2024-12-10 11:52:30 +07:00
Suphonchai Phoonsawat
c5d0d4a941 Merge remote-tracking branch 'origin/develop' into develop 2024-12-10 10:05:46 +07:00
Suphonchai Phoonsawat
5ada115c90 Add comment 2024-12-10 10:05:21 +07:00
Bright
d29a4a4747 migration profileSalaryHistory 2024-12-10 09:49:41 +07:00
Bright
da6c407678 เงินพิเศษ 2024-12-10 09:22:10 +07:00
Suchin Sapphasitthatha
273b695d07 add CI 2024-12-08 07:09:01 +00:00
kittapath
30c09a1ccb test build discord 2024-12-07 09:31:56 +07:00
Bright
a2d5cec4fe add field amountSpecial 2024-12-06 18:53:56 +07:00