Commit graph

2695 commits

Author SHA1 Message Date
mamoss
03f6c0a4a7 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-04-08 15:10:41 +07:00
mamoss
9cb914e076 ส่งข้อมูล กจ 2025-04-08 15:10:28 +07:00
bdaf8fbce9 fix eva ประวัติการรับราชการ 2025-04-08 12:10:04 +07:00
0c63850934 Merge branch 'develop' into adiDev 2025-04-08 11:18:45 +07:00
faa4bc9c4d fix \n 2025-04-08 11:16:04 +07:00
mamoss
d9fb4110e3 space posno 2025-04-05 19:21:50 +07:00
b1b9700e40 org \n 2 2025-04-04 10:07:34 +07:00
351621ee18 Merge branch 'adiDev' into develop 2025-04-04 09:54:21 +07:00
bb69bb5096 org /n 2025-04-04 09:52:59 +07:00
Bright
5837ca1724 fix issue #1357 ข้อมูลอายุราชการไม่แสดง 2025-04-03 17:41:47 +07:00
Bright
3ce2f932d6 no message 2025-04-03 17:23:46 +07:00
79ada6fcee Merge branch 'develop' into adiDev 2025-04-03 16:54:35 +07:00
4d61aec707 update viewPosMaster 2025-04-03 16:53:23 +07:00
8723fdd81d fix response orgName 2025-04-03 16:49:44 +07:00
mamoss
25edb18feb Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-04-03 16:40:28 +07:00
mamoss
a17ca1a7d8 คำสั่งยกเลิก 2025-04-03 16:40:19 +07:00
Bright
eb2bf96c64 fix หลังออกคำสั่งส่งตัวกลับสถานะไม่อัพเดท 2025-04-03 13:26:53 +07:00
Bright
bb53d4ef63 สร้าง+แก้ไข ส่งชื่อคำสั่งเพิ่ม 2025-04-03 13:06:10 +07:00
mamoss
4b7ca5fbf4 comment where in gen 2025-04-03 11:43:43 +07:00
mamoss
9da9b812c1 แก้สถ่นะออกคำสั่ง 2025-04-03 11:17:05 +07:00
Bright
26a16c6833 fix issue #1354 2025-04-02 18:45:25 +07:00
Bright
8c2de2e7bf fix issue #1354 2025-04-02 18:11:35 +07:00
2faf631f7b fix view duplicate field name 2025-04-02 14:00:54 +07:00
mamoss
3c7c4fe214 migrate 2025-04-02 13:20:52 +07:00
mamoss
3b56a81a61 Merge branch 'main' into develop 2025-04-02 13:14:16 +07:00
mamoss
1af0cd483d Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-04-02 13:14:10 +07:00
mamoss
46d6ab106d edit search 2025-04-02 11:44:26 +07:00
mamoss
3e7a00e35d filter salary 2025-04-02 11:29:30 +07:00
Bright
3c889b8db6 Merge branch 'develop-Bright' into develop 2025-04-02 10:10:28 +07:00
Bright
0a217642a0 fix bug ออกคำสั่งไม่บันทืกลงทะเบียนประวัติ (เปลี่ยน type ตัวแปร refId) 2025-04-02 10:10:21 +07:00
7d23d00a06 add viewPosmaster 2025-04-02 10:01:00 +07:00
5d4727761f fix พ้นพนักงาน 2025-04-01 20:46:30 +07:00
mamoss
5f53769292 search retire 2025-04-01 15:00:13 +07:00
a03a53954c Merge branch 'develop' into adiDev 2025-04-01 14:31:27 +07:00
0a9fd9f07e update 2025-04-01 14:29:43 +07:00
mamoss
87337727eb Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-04-01 14:18:06 +07:00
mamoss
2a534b40c4 test migrste 2025-04-01 14:17:57 +07:00
26ef28f5cf Merge branch 'develop' into adiDev 2025-04-01 13:38:34 +07:00
68e0fb1e5a fix command 2025-04-01 13:37:32 +07:00
Methapon2001
65ba3c73e2 Merge branch 'feat/socket-message-type' into develop 2025-04-01 11:35:42 +07:00
Methapon2001
ac5d6b015a feat: add message type to websocket 2025-04-01 11:35:16 +07:00
mamoss
68f680d841 edit path 2025-04-01 11:28:58 +07:00
mamoss
72bd27c9b0 status ช่วยราชการ 2025-04-01 11:14:42 +07:00
mamoss
00fbe53f17 on noti 2025-04-01 01:34:38 +07:00
mamoss
aac393f6f8 check type object log 2025-04-01 00:38:04 +07:00
mamoss
23cc373e33 sort root 2025-03-31 17:45:00 +07:00
Bright
97c1f07a6a Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop 2025-03-31 17:36:21 +07:00
Methapon2001
4ae9d2d360 Merge branch 'feat/socket-notification' into develop 2025-03-31 17:35:15 +07:00
Bright
046f6bff85 ออกคำสั่งกลับรับราชการ ปั๊มฟิลด์ประเภท ระดับ ตำแหน่งใหม่ 2025-03-31 17:35:09 +07:00
Methapon2001
11f4636342 feat: add notification 2025-03-31 17:34:06 +07:00