Commit graph

3818 commits

Author SHA1 Message Date
ba76e787b0 แก้ไขค้นหาชื่อคนครอง master/list 2024-03-01 11:17:57 +07:00
21aa51ff99 Merge branch 'develop' into adiDev 2024-02-29 17:50:17 +07:00
019bdfcd1d fix sort posMasterNo 2024-02-29 17:49:39 +07:00
Kittapath
432c3f6851 no message 2024-02-29 14:41:15 +07:00
Kittapath
15c6932f91 เงินเดือนไม่มีค่าให้เป็นnull 2024-02-29 14:07:39 +07:00
Kittapath
b53176ed05 เพิ่มฟิว isretire 2024-02-29 11:29:16 +07:00
Kittapath
d45f957214 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-28 18:12:33 +07:00
Kittapath
627fa3c839 no message 2024-02-28 18:11:56 +07:00
Bright
4a11d52a82 OrganizationUnauthorizeController (No Token) 2024-02-28 17:56:16 +07:00
6642f395f0 remove return new HttpSuccess([]) more 2024-02-28 15:07:35 +07:00
bfae3e012d format 2024-02-28 14:48:41 +07:00
7531a9c582 remove try catch more 2024-02-28 14:47:28 +07:00
09cc93fdf8 Merge branch 'develop' into adiDev 2024-02-28 14:13:40 +07:00
54b06e6f9a fix 072 2024-02-28 14:12:59 +07:00
Bright
02aaa63d09 แก้ caption ไอดี 2024-02-28 14:07:49 +07:00
Bright
da6f901b81 แก้ caption ไอดี 2024-02-28 14:00:38 +07:00
c1599e9d41 fix 072 2024-02-28 13:38:08 +07:00
1c9a4d47cc Merge branch 'develop' into adiDev 2024-02-28 11:31:43 +07:00
e9ed8ff3f4 remove try catch 2024-02-28 11:31:01 +07:00
Kittapath
98cfe8f639 no message 2024-02-28 11:28:06 +07:00
039b11d1c3 Merge branch 'develop' into adiDev 2024-02-28 10:37:40 +07:00
439e1ffaa4 remove try catch 2024-02-28 10:36:44 +07:00
Kittapath
e8b14c648e api โครงสร้างล่าสุด 2024-02-28 10:33:51 +07:00
Kittapath
a7fb4e87b3 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-27 17:31:31 +07:00
Kittapath
16324a09fd no message 2024-02-27 17:30:37 +07:00
f1cc9becc9 Merge branch 'develop' into adiDev 2024-02-27 17:21:53 +07:00
65f91cd327 ORG_072 2024-02-27 17:20:48 +07:00
Bright
5cb6126b39 crud profileSalary 2024-02-23 15:15:11 +07:00
Bright
e147412ea4 Entity profileSalary 2024-02-23 14:19:39 +07:00
d5e318f8dc clear comment 2024-02-23 09:36:28 +07:00
Kittapath
1eb01fb4d8 ต้นหาเลขที่ตำแหน่ง 2024-02-23 09:26:16 +07:00
Kittapath
1a851ccf95 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-22 17:00:58 +07:00
Kittapath
f1c7ddd393 no message 2024-02-22 17:00:43 +07:00
4d8fb8e5a3 เพิ่ม paginate และ keyword org_065 2024-02-22 16:32:13 +07:00
Kittapath
6c843f649f ค้นหาคนทดลองงาน 2024-02-22 15:44:40 +07:00
Kittapath
7eef964d48 เลขที่ตำแหน่งซ้ำ 2024-02-22 10:08:29 +07:00
Kittapath
b42af12a5f Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-21 17:48:34 +07:00
Kittapath
4ea60efd1a no message 2024-02-21 17:10:30 +07:00
Bright
cd30175423 no message 2024-02-21 17:04:07 +07:00
Kittapath
6b2f1c99d8 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-21 16:22:09 +07:00
Kittapath
121c7f56e8 แก้บักตำแหน่ง 2024-02-21 16:18:32 +07:00
Bright
ee6f2c8551 edit posMaster 2024-02-21 16:13:23 +07:00
Kittapath
ff46ce568b Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-21 13:53:24 +07:00
Kittapath
614fe24e12 no message 2024-02-21 13:53:02 +07:00
feedc9b527 ckp 2024-02-21 13:33:55 +07:00
b04699e5f4 Merge branch 'adiDev' into develop 2024-02-20 18:04:52 +07:00
352ced8053 edit position 2024-02-20 18:04:13 +07:00
Kittapath
6e84a46ac3 no message 2024-02-20 17:50:02 +07:00
Kittapath
24f2adbb22 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
# Conflicts:
#	src/controllers/PositionController.ts
2024-02-20 17:13:26 +07:00
Kittapath
8fe7d295fe Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-20 17:12:28 +07:00