Commit Graph

1530 Commits

Author SHA1 Message Date
黎永顺 0301618fc5 Merge branch 'hotfix/2.10.1.2402.01' into release/2.10.1.2402.01 2024-03-06 14:33:55 +08:00
黎永顺 fce72a71fc hotfix/2.10.1.2402.01 2024-03-06 14:33:28 +08:00
黎永顺 3c30951bd0 Merge branch 'feature/2.10.1.2402.01-社保台账导入缓存' into release/2.10.1.2402.01 2024-03-06 14:08:15 +08:00
黎永顺 87d699c59d feature/2.10.1.2402.01-社保台账导入缓存 2024-03-06 14:04:47 +08:00
黎永顺 df9e9c9a21 feature/2.10.1.2402.01-社保台账导入缓存 2024-03-05 17:49:37 +08:00
黎永顺 f732bcaafb Merge branch 'feature/2.10.1.2401.01-页面操作日志添加' into release/2.10.1.2402.01
# Conflicts:
#	pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js
#	pc4mobx/hrmSalary/stores/baseForm.js
2024-03-05 14:38:57 +08:00
黎永顺 3f23bc29e5 Merge branch 'feature/2.10.1.2402.01-我的薪资福利显示基础配置' into release/2.10.1.2402.01
# Conflicts:
#	pc4mobx/hrmSalary/index.js
2024-03-05 14:25:33 +08:00
黎永顺 91bc849b49 feature/2.10.1.2402.01-社保台账导入缓存 2024-03-05 14:23:13 +08:00
黎永顺 752eb6b6d1 feature/2.10.1.2401.01-页面操作日志添加 2024-02-28 16:42:15 +08:00
黎永顺 5e9a9c2822 hotfix/2.10.1.2402.01
薪酬统计报表设置添加薪资账套的设置项
2024-02-28 15:48:22 +08:00
黎永顺 194e575e25 hotfix/2.10.1.2402.01 2024-02-27 16:33:50 +08:00
黎永顺 07e19164d8 feature/2.10.1.2401.01-页面操作日志添加 2024-02-27 13:49:21 +08:00
黎永顺 86c5e50bb0 Merge branch 'hotfix/2.10.1.2402.01' into feature/2.10.1.2401.01-页面操作日志添加 2024-02-27 11:34:28 +08:00
黎永顺 9120ee93d5 hotfix/2.10.1.2402.01 2024-02-27 11:32:54 +08:00
黎永顺 b42f9c8e13 feature/2.10.1.2402.01-我的薪资福利显示基础配置 2024-02-26 15:29:04 +08:00
黎永顺 ac479676e0 release/2.10.1.2402.01-个税 2024-02-23 17:38:42 +08:00
黎永顺 fe95424386 feature/2.10.1.2402.01-我的薪资福利显示基础配置 2024-02-23 16:20:29 +08:00
黎永顺 7b66f866df feature/2.10.1.2401.01-页面操作日志添加 2024-02-23 15:59:06 +08:00
黎永顺 6f7b21ce5b feature/2.10.1.2401.01-最优年终奖计税方案 2024-02-23 15:20:22 +08:00
黎永顺 7078b1c6c4 feature/2.10.1.2401.01-页面操作日志添加 2024-02-23 10:13:43 +08:00
黎永顺 949b907e89 Merge branch 'release/2.10.1.2401.02' into feature/2.10.1.2401.01-页面操作日志添加 2024-02-21 10:50:36 +08:00
黎永顺 0e16bab13c feature/2.10.1.2401.01-页面操作日志添加 2024-02-20 17:03:51 +08:00
黎永顺 eec52e34c1 Merge branch 'feature/2.10.1.2401.01-社保福利方案重构' into release/2.10.1.2401.02 2024-02-20 15:53:18 +08:00
黎永顺 2d6383eebc Merge branch 'feature/2.10.1.2401.01-社保福利台账列表页面重构' into release/2.10.1.2401.02 2024-02-20 15:52:51 +08:00
黎永顺 e389d7f024 Merge branch 'feature/2.10.1.2401.01-工资单配置反馈开关' into release/2.10.1.2401.02 2024-02-20 15:52:20 +08:00
黎永顺 5afb7e107a 0release/2.10.1.2401.01 2024-02-20 15:45:31 +08:00
黎永顺 d6ec6c71e8 feature/2.10.1.2401.01-工资单配置反馈开关 2024-02-19 11:11:58 +08:00
黎永顺 4b95f6811f feature/2.10.1.2401.01-页面操作日志添加 2024-02-19 09:03:40 +08:00
黎永顺 47608b0522 feature/2.10.1.2401.01-社保福利方案重构 2024-02-18 14:48:06 +08:00
黎永顺 5614a0da6d feature/2.10.1.2401.01-社保福利方案重构 2024-02-06 17:36:15 +08:00
黎永顺 4be5c373ec feature/2.10.1.2401.01-社保福利方案重构 2024-02-06 16:56:10 +08:00
黎永顺 dc624af9bd feature/2.10.1.2401.01-社保福利方案重构 2024-02-05 14:53:38 +08:00
黎永顺 8ed92e793d feature/2.10.1.2401.01-社保福利方案重构 2024-02-04 17:04:05 +08:00
黎永顺 d866cc07cf feature/2.10.1.2401.01-社保福利方案重构 2024-02-02 16:09:03 +08:00
黎永顺 3c57000afc feature/2.10.1.2401.01-页面操作日志添加 2024-02-01 14:04:55 +08:00
黎永顺 e2898441cf feature/2.10.1.2401.01-页面操作日志添加 2024-01-31 11:37:20 +08:00
黎永顺 3093279f29 feature/2.10.1.2401.01-页面操作日志添加 2024-01-31 11:31:14 +08:00
黎永顺 9697e5aa81 feature/2.10.1.2401.01-页面操作日志添加 2024-01-31 11:29:16 +08:00
黎永顺 4a47fa1e85 feature/2.10.1.2401.01-页面操作日志添加 2024-01-31 11:27:40 +08:00
黎永顺 a6f382a36b feature/2.10.1.2401.01-页面操作日志添加 2024-01-31 10:24:15 +08:00
黎永顺 169f90d44b Merge branch 'feature/2.10.1.2401.01-社保福利台账列表页面重构' into feature/2.10.1.2401.01-页面操作日志添加 2024-01-30 17:52:05 +08:00
黎永顺 671f0c42b4 Merge branch 'release/2.10.1.2401.01' into feature/2.10.1.2401.01-页面操作日志添加 2024-01-30 17:38:14 +08:00
黎永顺 0b3c97a53f feature/2.10.1.2401.01-页面操作日志添加 2024-01-30 17:34:02 +08:00
黎永顺 0e5c97d447 0release/2.10.1.2401.01 2024-01-30 16:59:05 +08:00
黎永顺 817f9767fc feature/2.10.1.2401.01-工资单配置反馈开关 2024-01-30 16:57:21 +08:00
黎永顺 c260c31bf8 release/2.10.1.2401.01
bug修复
2024-01-30 15:48:42 +08:00
黎永顺 ba49afb85d release/2.10.1.2401.01
bug修复
2024-01-30 15:46:37 +08:00
黎永顺 cf9d8f41e0 Merge branch 'feature/2.10.1.2401.01-工资单查看与调薪记录分开展示' into release/2.10.1.2401.01 2024-01-30 15:30:27 +08:00
黎永顺 5a65c42179 Merge branch 'feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置' into release/2.10.1.2401.01 2024-01-30 15:29:36 +08:00
黎永顺 095a833084 release/2.10.1.2401.01 2024-01-29 10:39:12 +08:00