Commit graph

3818 commits

Author SHA1 Message Date
4479507ae8 fix brother privilage 2025-12-19 13:58:40 +07:00
c3c9389fb1 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
2025-12-18 18:31:26 +07:00
18ae347122 #2139 2025-12-18 18:31:04 +07:00
98ff8bed26 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
2025-12-18 18:17:36 +07:00
6d31b84a2c Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-12-18 18:16:45 +07:00
2917d8b593 fix 2025-12-18 18:16:32 +07:00
harid
4ace351235 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m0s
2025-12-18 17:30:42 +07:00
harid
fd22fcf990 log user 2025-12-18 17:29:18 +07:00
harid
f4e8f3f28b Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
2025-12-17 12:42:52 +07:00
harid
586331e870 API ตรวจสอบเช็คเลขบัตรประจำตัวประชาชน ทำไว้ให้ service อื่นๆ ภายในระบบ call มาตรวจสอบเลขบัตรประจำตัวประชาชน 2025-12-17 12:37:05 +07:00
8010a1ab85 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 58s
2025-12-15 17:33:56 +07:00
a813d31df9 #2123
Some checks failed
release / release (push) Failing after 8s
2025-12-15 17:30:33 +07:00
e93275ecd0 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 57s
2025-12-15 14:06:43 +07:00
e20eb9e936 fix search
Some checks failed
release / release (push) Failing after 9s
2025-12-15 14:06:07 +07:00
9e8ad37982 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 55s
2025-12-15 13:35:46 +07:00
3111e10bfe #2119
Some checks failed
release / release (push) Failing after 11s
2025-12-15 11:48:18 +07:00
harid
161d5a904c Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m2s
2025-12-12 18:32:22 +07:00
harid
5e9189a489 เพิ่มฟิลด์ isSalary + api แก้ไขเงินเดือนทั้งกลุ่ม #2102 2025-12-12 18:27:32 +07:00
e4e6b3bdf2 Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-org into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-org:
2025-12-12 09:32:09 +07:00
c279688387 Merge branch 'develop' into dev
* develop:
  add permission brother
  migrate view #2109
  comment
  แก้ parent
  update permission
  fix role
  no message
  no message
  fix role
  แก้ออกคำสั่งแต่งตั้งคณะกรรม Noti ซ้ำ  #1995
2025-12-12 09:06:41 +07:00
mamoss
3a4e16deb0 add permission brother 2025-12-12 01:36:51 +07:00
c9f4e8f3eb Merge branch 'main' of ssh://hrms-git.bangkok.go.th:6611/BMA-HRMS/hrms-api-org
* 'main' of ssh://hrms-git.bangkok.go.th:6611/BMA-HRMS/hrms-api-org:
2025-12-11 17:30:21 +07:00
e9797cdd82 Merge branch 'develop'
* develop:
  migrate view #2109
  comment
  แก้ parent
  update permission
2025-12-11 17:27:36 +07:00
harid
2c5faea7c0 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 58s
2025-12-11 15:26:36 +07:00
harid
878e52b1b0 migrate view #2109 2025-12-09 18:16:46 +07:00
harid
f273276ce2 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 56s
2025-12-08 09:35:59 +07:00
mamoss
a4d87d7051 Merge branch 'develop' 2025-12-07 22:10:57 +07:00
mamoss
84f14466c7 comment 2025-12-07 22:10:29 +07:00
mamoss
a8bb884564 แก้ parent 2025-12-07 16:36:18 +07:00
mamoss
f814454003 update permission 2025-12-07 13:51:01 +07:00
2e90440dea Merge branch 'develop'
* develop:
  fix role
2025-12-03 19:48:01 +07:00
bebd56b2e2 Merge branch 'main' of ssh://hrms-git.bangkok.go.th:6611/BMA-HRMS/hrms-api-org
* 'main' of ssh://hrms-git.bangkok.go.th:6611/BMA-HRMS/hrms-api-org:
2025-12-03 19:34:18 +07:00
harid
473137f813 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
2025-12-03 19:32:39 +07:00
harid
b436b67167 fix role 2025-12-03 19:32:18 +07:00
ac93324253 Merge branch 'develop'
* develop:
  no message
  no message
  fix role
  แก้ออกคำสั่งแต่งตั้งคณะกรรม Noti ซ้ำ  #1995
  add role parent
2025-12-03 19:21:49 +07:00
harid
2505904aea Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m0s
2025-12-03 18:59:09 +07:00
harid
b729a91997 no message 2025-12-03 18:58:48 +07:00
harid
f61ea52935 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 56s
2025-12-03 18:12:38 +07:00
harid
8cc0926b7b no message 2025-12-03 18:12:08 +07:00
harid
e611f2612e Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
2025-12-03 18:04:15 +07:00
harid
87a8c03dc7 fix role 2025-12-03 18:03:50 +07:00
harid
950e5e4553 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 55s
2025-12-01 14:57:47 +07:00
harid
e8b1d29c43 แก้ออกคำสั่งแต่งตั้งคณะกรรม Noti ซ้ำ #1995 2025-12-01 14:56:31 +07:00
ef3fb8eef8 Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-org into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 58s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-org:
2025-12-01 11:42:29 +07:00
e0c6d62265 Merge branch 'develop' into dev
* develop:
  add role parent
  migrate #2043
  เฉพาะคำสั่ง C-PM-10 ให้ตัด profilesNotiRequest ที่ส่ง noti ครั้งแรกออก เพราะ UI ปิด Tab นี้
  เฉพาะคำสั่ง C-PM-10 ให้ตัด receiverUserId ที่ส่ง noti ครั้งแรกออก #1995
  fix รายชื่อราชการที่เลื่อนเงินเดือน (isPunish) salary/gen เส้นเก่า
  #2036
  อัพเดตฟิลด์ prefixMain #2033
  อัพเดท view_pos_master
  fix duplicate salary list
  fix
2025-12-01 11:42:23 +07:00
mamoss
10dc1670b8 Merge branch 'develop' 2025-11-29 15:36:34 +07:00
mamoss
7eeeb49389 Merge branch 'develop' 2025-11-29 15:33:02 +07:00
mamoss
bd9c270cd7 add role parent 2025-11-29 14:56:58 +07:00
319933467f Merge branch 'develop'
* develop:
  migrate #2043
  เฉพาะคำสั่ง C-PM-10 ให้ตัด profilesNotiRequest ที่ส่ง noti ครั้งแรกออก เพราะ UI ปิด Tab นี้
  เฉพาะคำสั่ง C-PM-10 ให้ตัด receiverUserId ที่ส่ง noti ครั้งแรกออก #1995
  fix รายชื่อราชการที่เลื่อนเงินเดือน (isPunish) salary/gen เส้นเก่า
  #2036
2025-11-29 10:04:30 +07:00
harid
3958bedcb2 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 58s
2025-11-27 19:42:59 +07:00