Commit Graph

17 Commits

Author SHA1 Message Date
lys 7c317607ea Merge branch 'release/2.19.1.2501.01' into feature/2.15.2.2411.01业务线-数据推送
# Conflicts:
#	pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
2025-01-22 11:13:55 +08:00
lys 30bbcfb712 release/2.19.1.2501.01 2025-01-07 15:59:44 +08:00
lys 07ef0535c4 release/2.19.1.2501.01 2025-01-07 15:55:25 +08:00
lys 6a4f9cd2af Merge branch 'feature/2.15.2.2411.01业务线' into feature/2.15.2.2411.01业务线-数据推送 2024-12-27 09:16:26 +08:00
lys 8b8f4cd610 release/2.18.2.2412.02 2024-12-25 17:20:55 +08:00
lys 571026ebf8 feature/2.15.2.2411.01业务线-数据推送 2024-11-21 14:10:47 +08:00
黎永顺 1c1aac66d7 hotfix/2.15.1.2409.01
浮动薪酬模块页面样式调整
2024-09-14 11:15:25 +08:00
黎永顺 8c038c8d74 Merge branch 'hotfix/2.15.1.2407.01' into feature/2.15.1.2407.01-浮动薪酬 2024-08-12 09:27:43 +08:00
黎永顺 70fe54efb7 feature/2.15.1.2407.01-浮动薪酬 2024-08-08 17:32:54 +08:00
黎永顺 334a582d62 hotfix/2.15.1.2407.01
考勤引用,薪资账套多选
2024-08-07 11:11:53 +08:00
黎永顺 3418bfe4aa hotfix/2.14.2.2405.02
公式编辑
2024-05-28 16:25:25 +08:00
黎永顺 8ed92e793d feature/2.10.1.2401.01-社保福利方案重构 2024-02-04 17:04:05 +08:00
liyongshun e552f34103 添加权限 2022-06-02 17:11:28 +08:00
MustangDeng b678ec91e6 验证 2022-04-06 14:26:16 +08:00
MustangDeng 32d0578be2 薪资方案 2022-04-02 17:34:40 +08:00
MustangDeng d7b1269f3a 薪资账套slideStep1 2022-03-15 17:50:54 +08:00
MustangDeng 35ede9dd67 2022-02-25 2022-02-25 09:24:56 +08:00