Commit graph

3482 commits

Author SHA1 Message Date
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
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
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
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
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
bd9c270cd7 add role parent 2025-11-29 14:56:58 +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
harid
072d9a6880 migrate #2043 2025-11-27 19:28:38 +07:00
harid
4bdf1ad7b4 เฉพาะคำสั่ง C-PM-10 ให้ตัด profilesNotiRequest ที่ส่ง noti ครั้งแรกออก เพราะ UI ปิด Tab นี้ 2025-11-26 16:48:35 +07:00
harid
4ba71ff830 เฉพาะคำสั่ง C-PM-10 ให้ตัด receiverUserId ที่ส่ง noti ครั้งแรกออก #1995 2025-11-26 16:20:11 +07:00
7e5b881f27 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
2025-11-26 09:56:27 +07:00
a0f18b858f fix รายชื่อราชการที่เลื่อนเงินเดือน (isPunish) salary/gen เส้นเก่า
Some checks failed
release / release (push) Failing after 10s
2025-11-26 09:47:12 +07:00
ff086903ca Merge branch 'adiDev' into develop 2025-11-26 09:43:05 +07:00
4f30ea9c6b #2036 2025-11-26 09:42:43 +07:00
harid
8b69a28c25 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 53s
2025-11-25 17:15:52 +07:00
harid
4c3d3dceff อัพเดตฟิลด์ prefixMain #2033 2025-11-25 17:11:51 +07:00
8f6637a656 อัพเดท view_pos_master 2025-11-25 13:36:17 +07:00
a66fac104a Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 58s
2025-11-25 12:01:49 +07:00
b26cbad5ee fix duplicate salary list 2025-11-25 12:01:06 +07:00
73dfffafea Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 57s
2025-11-25 10:56:35 +07:00
d2426ca6e4 fix
Some checks failed
release / release (push) Failing after 10s
2025-11-25 10:54:16 +07:00
cdba57a478 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 55s
2025-11-24 11:08:41 +07:00
7c345a61f3 #2004
Some checks failed
release / release (push) Failing after 11s
2025-11-24 10:38:58 +07:00
harid
1e32478f3c Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m0s
2025-11-19 14:20:04 +07:00
harid
925994dec6 add districts & subDistricts 2025-11-19 14:19:08 +07:00
harid
2462128f22 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 58s
2025-11-17 11:14:32 +07:00
harid
12f05e5ec3 revert (fix view error) 2025-11-17 11:13:49 +07:00
harid
f4f775b5ea เรียงลำดับข้อมูลหลัก #1991 2025-11-14 17:33:37 +07:00
2a9acf19f4 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 58s
2025-11-13 15:17:09 +07:00
harid
6376a6ecfd fix #1981, #1982
Some checks failed
release / release (push) Failing after 9s
2025-11-13 15:14:10 +07:00
cf6646d45d Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 57s
2025-11-13 13:13:24 +07:00
e1b4f9f929 ขอโอนลบคน + เพิ่มประวัติตำแหน่ง 2025-11-13 13:13:03 +07:00
cd3bcac5f8 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
2025-11-13 11:50:02 +07:00
484d2994ce fix 2025-11-13 11:49:38 +07:00