Commit Graph

18 Commits

Author SHA1 Message Date
黎永顺 bea6efa1c4 Merge branch 'release/2.19.1.2501.01' into custom/陕西万众 2026-01-07 17:52:15 +08:00
lys 07c40750da release/2.19.1.2501.01 2025-05-19 16:04:11 +08:00
lys 80307c7b91 release/2.19.1.2501.01 2025-04-14 16:38:41 +08:00
lys cac96cbae6 Merge branch 'release/2.19.1.2501.01' into custom/陕西万众 2025-04-11 10:59:33 +08:00
lys ecf34e4886 release/2.19.1.2501.01 2025-02-11 14:17:56 +08:00
lys e60d6d4562 Merge branch 'release/2.18.1.2412.01' into custom/陕西万众
# Conflicts:
#	pc4mobx/hrmSalary/apis/ledger.js
#	pc4mobx/hrmSalary/pages/ledgerPage/config.js
#	pc4mobx/hrmSalary/pages/salaryItem/syncToSalaryAccountSetDialog.js
#	pc4mobx/hrmSalary/stores/ledger.js
2024-12-13 15:15:41 +08:00
黎永顺 25b7a2341e hotfix/2.15.1.2407.01 2024-08-05 11:05:25 +08:00
黎永顺 4f5aa85c73 Merge branch 'release/2.14.5.2406.03' into custom/陕西万众-薪资账套薪资核算配置
# Conflicts:
#	pc4mobx/hrmSalary/apis/calculate.js
#	pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
#	pc4mobx/hrmSalary/stores/calculate.js
2024-07-10 14:43:24 +08:00
黎永顺 eeea664a8a feature/2.12.1.2404.02-薪资核算判断账套是否修改提示 2024-05-07 14:09:08 +08:00
黎永顺 2fb3c89947 feature/2.12.1.2404.02-薪资核算判断账套是否修改提示 2024-04-26 16:53:51 +08:00
黎永顺 08d4ed70ba custom/陕西万众-薪资账套薪资核算配置 2024-01-05 10:33:24 +08:00
黎永顺 6e56b436d6 feature/2.9.9.2312.01-薪资核算列表在线编辑-批量更新薪资项目项 2023-12-06 14:46:36 +08:00
黎永顺 f4574570d9 hotfix/2.9.42311.02 2023-11-15 13:53:56 +08:00
黎永顺 49e5a0ad73 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-27 17:42:55 +08:00
黎永顺 0902c3bb71 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-27 15:42:42 +08:00
黎永顺 b54a561ba4 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-26 11:03:19 +08:00
黎永顺 707ca40f05 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-15 11:14:39 +08:00
黎永顺 d008654bf8 hotfix/2.9.42309.01 2023-09-14 15:50:24 +08:00