Commit graph

2097 commits

Author SHA1 Message Date
mamoss
124d79dbee Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-03-26 10:58:11 +07:00
mamoss
4b1fabad44 leavecommandno add year 2025-03-26 10:58:03 +07:00
7649770b43 Merge branch 'develop' into adiDev 2025-03-26 10:34:50 +07:00
052556b819 add shortName search 2025-03-26 10:31:59 +07:00
mamoss
a34a048dee Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-03-26 10:19:54 +07:00
mamoss
53251652b2 add isedit add permission 2025-03-26 10:19:45 +07:00
70af866b0c fix 2025-03-25 15:12:20 +07:00
5d0b2f13bb Merge branch 'develop' into adiDev 2025-03-25 14:41:11 +07:00
c17e1decda #1274,#1277 2025-03-25 14:39:20 +07:00
mamoss
dc382f0ab4 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-03-25 14:08:24 +07:00
mamoss
cd2cd1645b api run corn job retire 2025-03-25 14:08:17 +07:00
df2612adf3 fix 2025-03-25 13:11:26 +07:00
24ce6c81c1 fix field type 2025-03-25 12:14:48 +07:00
mamoss
9e1ebf6de1 migrate 2025-03-25 11:14:01 +07:00
mamoss
b01f074afe map profilesalary 2025-03-25 09:36:38 +07:00
mamoss
4a87969337 sort commandcode 2025-03-24 22:43:43 +07:00
mamoss
6ac682d98c Merge branch 'main' into develop 2025-03-24 21:58:15 +07:00
mamoss
af3e0abd2a add permission profile 2025-03-24 21:57:50 +07:00
a47c804969 sort and add field 2025-03-24 17:59:47 +07:00
mamoss
dc9ac66896 สลับสำเนา 2025-03-21 18:08:33 +07:00
mamoss
637916e5d8 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-03-21 17:14:58 +07:00
mamoss
5eeb380e01 หาคนส่งสำเนา 2025-03-21 17:14:45 +07:00
879e75c688 Merge branch 'develop' into adiDev 2025-03-21 17:07:13 +07:00
2a9d00ada3 add rabbit noti 2025-03-21 17:05:52 +07:00
mamoss
1f0ae6cc5a ค้นหา 2025-03-21 16:36:11 +07:00
mamoss
87ee9b5b12 workflow add keycloakId 2025-03-21 15:03:55 +07:00
mamoss
968d5f6dad sort salary temp 2025-03-21 10:56:12 +07:00
f033205e1d Merge branch 'develop' into adiDev
# Conflicts:
#	src/controllers/ProfileSalaryTempController.ts
2025-03-21 10:30:59 +07:00
9029baffab fix 2025-03-21 10:27:33 +07:00
mamoss
b8bea7c8ef search profilesalay temp 2025-03-20 18:44:41 +07:00
8c30dc56f4 fix 2025-03-20 18:03:47 +07:00
91f4c59e35 fix 2025-03-20 17:17:38 +07:00
86e32d4e39 fix 2025-03-20 15:38:42 +07:00
mamoss
fc5f28ee36 แก้ไขข้อมูลตำแหน่ง 2025-03-19 17:51:01 +07:00
kittapath
074e953988 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-03-19 10:31:43 +07:00
mamoss
224290da87 create posmaster prefix null 2025-03-19 10:18:03 +07:00
mamoss
b5e40cb127 add fild current 2025-03-19 10:11:35 +07:00
kittapath
85feca0041 ตำแหน่งทางการบริหาร 2025-03-18 22:08:37 +07:00
kittapath
e570339e1a list รายชื่อ workflow 2025-03-18 15:14:27 +07:00
kittapath
b2cd6192c5 sort salary 2025-03-18 14:05:30 +07:00
kittapath
9b4db9a66f Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-03-17 15:48:53 +07:00
ca45bb780c Merge branch 'develop' into adiDev 2025-03-17 15:47:56 +07:00
kittapath
94a5fb316b Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-03-17 15:46:36 +07:00
3d6363b318 update 2025-03-17 15:46:30 +07:00
kittapath
3866e4a07f no message 2025-03-17 15:45:24 +07:00
mamoss
ae16adc9f7 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-03-17 15:42:57 +07:00
mamoss
23b6452d56 update salary 2025-03-17 15:42:48 +07:00
kittapath
044373d1b2 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-03-17 15:38:14 +07:00
kittapath
c5235e960d update 2025-03-17 15:38:02 +07:00
a07326721d Merge branch 'develop' into adiDev 2025-03-17 14:10:10 +07:00