Commit graph

1138 commits

Author SHA1 Message Date
Kittapath
568d326797 no message 2024-06-25 10:21:30 +07:00
Kittapath
b11be3364f no message 2024-06-24 10:52:40 +07:00
5a634b4dd3 Merge branch 'develop' into adiDev 2024-06-21 18:07:13 +07:00
b8d65aee55 update 2024-06-21 18:06:23 +07:00
Bright
5812f9e56d change endPoint 2024-06-21 17:56:31 +07:00
Kittapath
5ca15d5433 แก้ tree org 2024-06-20 16:10:19 +07:00
Kittapath
7f21756928 ปรับโครงสร้าง root 2024-06-20 11:58:51 +07:00
Kittapath
9de005c7ae api รักษาการแทน 2024-06-19 23:03:54 +07:00
Bright
f7c553ec1d ออกคำสั่ง 19,20,25,26,27,28,29,30,31,32 2024-06-19 11:23:12 +07:00
7ad713116f fix 2024-06-18 17:42:47 +07:00
7871e18130 add function emp 2024-06-18 16:10:46 +07:00
2a4c3e745f add function leave/{id} with profile/salary 2024-06-18 15:43:25 +07:00
Bright
e2d5f7e13d Merge branch 'develop' into develop-Bright 2024-06-18 13:27:20 +07:00
Bright
cfe1eba3b0 ออกคำสั่ง C-PM-11, C-PM-12 2024-06-18 13:26:55 +07:00
Kittapath
aa23879b82 no message 2024-06-18 12:31:49 +07:00
Kittapath
c3cecbc763 no message 2024-06-18 12:08:03 +07:00
9bf37a2f1d fix 2024-06-18 10:01:48 +07:00
df05b9afaf add insigniaTypeId 2024-06-17 17:54:45 +07:00
063752f002 add pointSumTotal 2024-06-17 17:39:26 +07:00
7351c9b510 Merge branch 'develop' into adiDev
# Conflicts:
#	src/controllers/ProfileEmployeeController.ts
2024-06-17 14:35:49 +07:00
196f13cfbd เพิ่ม field /api/v1/org/profile-employee/report 2024-06-17 14:34:17 +07:00
Bright
6860d52d13 no message 2024-06-17 14:18:06 +07:00
Kittapath
61b56a0d62 no message 2024-06-17 13:27:11 +07:00
30286317c6 fix return 2024-06-14 16:30:46 +07:00
e14aef7202 Merge branch 'develop' into adiDev 2024-06-14 16:24:23 +07:00
d613637c95 api enableStatus 2024-06-14 16:23:36 +07:00
Kittapath
114ab13a38 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-06-14 15:15:33 +07:00
Kittapath
71f1e71f82 Merge 2024-06-14 15:14:16 +07:00
f05c2f4b63 add function 2024-06-14 14:46:00 +07:00
252ecdf6ee Merge branch 'develop' into adiDev 2024-06-14 14:38:55 +07:00
a213d75c70 fix 2024-06-14 14:38:17 +07:00
Bright
892a615c35 ปรับให้แก้ไขสิทธิ์ได้ 2024-06-14 14:06:40 +07:00
bed7dbb896 Merge branch 'develop' into adiDev 2024-06-14 13:30:45 +07:00
8a3b374701 fix 2024-06-14 13:29:36 +07:00
Bright
76432d49a2 Merge branch 'develop' into develop-Bright 2024-06-14 13:27:32 +07:00
Bright
7fca1e320b ปรับ relation 2024-06-14 13:27:02 +07:00
24820c4322 Merge branch 'develop' into adiDev 2024-06-14 13:22:26 +07:00
860989c3cf fix test 2024-06-14 13:21:43 +07:00
Bright
bfe7daa63d เพิ่มฟิลด์ 2024-06-14 12:28:09 +07:00
7ed90ba142 fix 2024-06-14 10:49:53 +07:00
152d813bb4 fix migration 2024-06-14 10:38:22 +07:00
4bd16513de Merge branch 'develop' into adiDev 2024-06-14 10:03:00 +07:00
ba628063b5 fix 2024-06-14 10:02:20 +07:00
Kittapath
baa7c09b3c Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-06-13 23:57:51 +07:00
Kittapath
681f016657 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-06-13 23:56:49 +07:00
210d1dc7ca Merge branch 'develop' into adiDev 2024-06-13 17:38:57 +07:00
52e0141de4 fix 2024-06-13 17:38:01 +07:00
Bright
fdaf457a08 no message 2024-06-13 17:37:57 +07:00
e6539edaec Merge branch 'develop' into adiDev 2024-06-13 16:16:36 +07:00
055173a038 fix 2024-06-13 16:15:56 +07:00