Commit graph

1874 commits

Author SHA1 Message Date
be2afbde3a Merge branch 'develop' into adiDev 2024-11-20 14:03:12 +07:00
9dac11934b checkpoint,แก้ไขชื่อฟิว 2024-11-20 14:02:01 +07:00
Bright
b85de85d7e no message 2024-11-19 18:13:08 +07:00
Bright
3803e593a5 Merge branch 'develop' into develop-Bright
# Conflicts:
#	src/controllers/ReportController.ts
2024-11-19 18:09:28 +07:00
Bright
530bce3505 Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop 2024-11-19 18:07:27 +07:00
Bright
b1c88e9872 no message 2024-11-19 18:07:06 +07:00
8eae807a64 Merge branch 'develop' into adiDev 2024-11-19 14:35:38 +07:00
b456fe46ff sort data #798 2024-11-19 14:34:33 +07:00
kittapath
a967afeb87 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
# Conflicts:
#	src/controllers/ReportController.ts
2024-11-19 12:57:14 +07:00
kittapath
3cd0b4e9da no message 2024-11-19 12:56:19 +07:00
Bright
ef01602285 no message 2024-11-19 11:46:53 +07:00
Bright
ab07e0485f update report4 2024-11-19 11:45:10 +07:00
kittapath
b089d9279a no message 2024-11-19 10:43:25 +07:00
kittapath
8f0624d27b Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-18 18:20:18 +07:00
kittapath
0e16114d60 no message 2024-11-18 18:20:07 +07:00
Bright
ae47c72569 mock report4 2024-11-18 17:51:26 +07:00
kittapath
5e4ea343dc no message 2024-11-18 17:40:38 +07:00
kittapath
5fcaf51908 no message 2024-11-18 17:29:36 +07:00
kittapath
9e78cf7345 no message 2024-11-18 17:23:40 +07:00
kittapath
3c9698f606 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-18 14:34:14 +07:00
kittapath
58c371b888 draft org 2024-11-18 14:34:01 +07:00
Bright
8f2b8568ef add salary 2024-11-18 13:38:41 +07:00
645b73e2e6 checkpoint 2024-11-18 12:02:45 +07:00
0c70fe006f test 2024-11-18 11:25:50 +07:00
5a9da1d428 Merge branch 'develop' into adiDev 2024-11-18 11:02:48 +07:00
a45f97e268 ทดลองปิด channel.prefetch 2024-11-18 11:01:44 +07:00
kittapath
1d5c285003 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-18 10:45:16 +07:00
kittapath
8001a4b138 get detail profile 2024-11-18 10:45:05 +07:00
01f2066075 Merge branch 'develop' into adiDev 2024-11-18 10:29:46 +07:00
53c7bc7b62 test rabbit 2024-11-18 10:28:08 +07:00
Bright
5bc6101e12 change profile.salary 2024-11-15 16:57:20 +07:00
376b50f729 Merge branch 'adiDev' into develop 2024-11-15 16:42:23 +07:00
d58170d2df test 2024-11-15 16:41:29 +07:00
Bright
f8bbbcfb99 Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop 2024-11-15 16:36:16 +07:00
Bright
c7c32be069 no message 2024-11-15 16:35:18 +07:00
e43b3d0e46 Merge branch 'adiDev' into develop 2024-11-15 16:30:44 +07:00
d685a355d0 test 2024-11-15 16:29:16 +07:00
Bright
722dc85509 fix 2024-11-15 16:26:26 +07:00
f6e01f95a2 Merge branch 'develop' into adiDev 2024-11-15 15:48:25 +07:00
fdbb53e5ae test rabbit 2024-11-15 15:46:50 +07:00
kittapath
f757e5aeeb Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-15 15:34:49 +07:00
kittapath
d4ef9e0702 add commander 2024-11-15 15:34:37 +07:00
3cb06d9e19 Merge branch 'develop' into adiDev 2024-11-15 15:14:59 +07:00
a3ce676d40 add log rabbitmq connect & create chanel 2024-11-15 15:13:52 +07:00
a130cc71a1 testRabbit 2024-11-15 15:10:34 +07:00
kittapath
23d3cabc88 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-15 14:57:08 +07:00
Bright
7e87cec833 api อัพเดทเงินเดือน 2024-11-15 14:55:59 +07:00
kittapath
b94c5c2f09 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-15 14:55:56 +07:00
kittapath
8dc18d744d no message 2024-11-15 14:54:58 +07:00
Bright
5ac8da1057 update profile.amount & fix lock 2024-11-15 13:48:24 +07:00