Commit graph

1025 commits

Author SHA1 Message Date
Bright
693afa4e5f เพิ่มฟิลด์ 2024-06-13 14:18:20 +07:00
Bright
4cccf6f685 api ออกคำสั่งย้ายสับเปลี่ยนตำแหน่ง 2024-06-13 13:00:33 +07:00
b7ce71d017 Merge branch 'develop' into adiDev
# Conflicts:
#	src/controllers/ProfileEmployeeController.ts
2024-06-13 12:00:50 +07:00
39de288f5b fix 2024-06-13 11:59:09 +07:00
Bright
7b2600988b no message 2024-06-13 11:54:57 +07:00
Kittapath
a9973e4ba7 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-06-13 10:22:18 +07:00
Kittapath
b2178c6341 ออกคำสั่งลูกจ้าง 2024-06-13 10:17:57 +07:00
Bright
aa92f377cf เพิ่มฟิลด์ 2024-06-13 10:10:48 +07:00
Kittapath
ae1a382dd0 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-06-12 21:55:54 +07:00
Kittapath
681347c2fb no message 2024-06-12 21:55:27 +07:00
Bright
0dd56266b4 api รายชื่อผู้ที่ย้ายสับเปลี่ยนตำแหน่ง 2024-06-12 18:50:07 +07:00
33b68fdb19 fix field 2024-06-12 17:58:16 +07:00
0a054d91ce Merge branch 'develop' into adiDev 2024-06-12 17:51:42 +07:00
cd456516c0 add field search-personal both 2024-06-12 17:50:48 +07:00
AnandaTon
ec5605be55 เพิ่ม isProbation 2024-06-12 17:44:19 +07:00
Kittapath
c06775634a migrate 2024-06-12 17:38:58 +07:00
Bright
68fbe05007 no message 2024-06-12 17:32:42 +07:00
Kittapath
681b0aa326 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-06-12 15:17:13 +07:00
Kittapath
982f1aabac no message 2024-06-12 15:16:55 +07:00
a4b29e0a1b fix 2024-06-12 15:10:36 +07:00
ea2566395e Merge branch 'develop' into adiDev 2024-06-12 14:55:58 +07:00
5b21866265 fix created 2024-06-12 14:55:20 +07:00
Kittapath
ebe1eea5e0 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-06-12 14:50:39 +07:00
Kittapath
e7dd0e64cb limit commander 2024-06-12 14:50:20 +07:00
AnandaTon
140bb6dbbc เพิ่ม Upload sql ของ posType เเละ posLevel 2024-06-12 14:44:18 +07:00
AnandaTon
bd9dee6da2 เพิ่มฟิว isDirecter isOfficer 2024-06-12 14:41:16 +07:00
Kittapath
2cd35849b2 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-06-12 14:24:16 +07:00
Kittapath
8665eb1543 list employee temp report 2024-06-12 14:18:55 +07:00
Bright
c95b056562 add field 2024-06-12 14:17:55 +07:00
Kittapath
7a4b25079f migrate 2024-06-12 13:27:48 +07:00
225063e8b7 Merge branch 'warunee-dev' into develop
* warunee-dev:
  add auth sync by menu

# Conflicts:
#	src/controllers/AuthSysController.ts
2024-06-12 13:25:53 +07:00
624b1a0627 updated throw 2024-06-12 13:23:02 +07:00
2f525bae95 add auth sync by menu 2024-06-12 13:21:15 +07:00
Kittapath
aaf28beb3c Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-06-12 12:53:05 +07:00
Kittapath
f1cdec9076 ออกคำสั่งลูกจ้างชั่วคราว 2024-06-12 12:52:12 +07:00
79a0d847ce Merge branch 'develop' into adiDev 2024-06-12 11:23:08 +07:00
ac9bcd065d fix 2024-06-12 11:22:28 +07:00
Kittapath
576f83d12f no message 2024-06-12 11:20:46 +07:00
d1fbd59e5f Merge branch 'develop' into adiDev 2024-06-12 10:50:48 +07:00
e60d47e9f0 fix 2024-06-12 10:50:07 +07:00
Kittapath
17b3f0aab4 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-06-12 10:45:30 +07:00
Kittapath
b9124e9d22 no message 2024-06-12 10:41:48 +07:00
Bright
7bb199d254 Merge branch 'develop' into develop-Bright 2024-06-12 10:25:51 +07:00
Bright
a559a40360 แก้Route 2024-06-12 10:25:13 +07:00
cf8281c38c Merge branch 'develop' into adiDev 2024-06-12 10:11:57 +07:00
194298ea5c add field parantNode 2024-06-12 10:11:13 +07:00
Bright
c1602a5512 api รอบย้ายสับเปลี่ยนตำแหน่ง 2024-06-12 10:06:53 +07:00
Kittapath
8145722355 เพิ่มฟิวส่งวันที่ยกเลิกเกษียณ 2024-06-12 09:25:59 +07:00
e184714676 Merge branch 'develop' into adiDev 2024-06-11 18:28:41 +07:00
ba065b4299 fix api role 2024-06-11 18:27:54 +07:00