Commit Graph

1633 Commits

Author SHA1 Message Date
黎永顺 22590c1577 feature/2.10.1.2402.01-个税-个税申报线下对比添加导出功能以及缓存对比项目的功能开发 2024-03-04 14:01:25 +08:00
黎永顺 2a7db5f6d3 feature/2.10.1.2402.01-个税-个税申报线下对比添加导出功能以及缓存对比项目的功能开发 2024-03-01 17:36:37 +08:00
黎永顺 88f03e0b0d feature/2.10.1.2402.01-个税-个税申报线下对比添加导出功能以及缓存对比项目的功能开发 2024-03-01 16:56:32 +08:00
黎永顺 b57a95979d feature/2.10.1.2402.01-个税-个税申报线下对比添加导出功能以及缓存对比项目的功能开发 2024-03-01 09:08:53 +08:00
黎永顺 4ebcb8a066 release/2.10.1.2402.01-个税 2024-02-27 16:36:58 +08:00
黎永顺 c4d78463da Merge branch 'hotfix/2.10.1.2402.01' into release/2.10.1.2402.01-个税 2024-02-27 16:34:26 +08:00
黎永顺 194e575e25 hotfix/2.10.1.2402.01 2024-02-27 16:33:50 +08:00
黎永顺 bfa0288585 release/2.10.1.2402.01-个税
人员信息报送添加姓名关键字搜索
2024-02-27 14:26:34 +08:00
黎永顺 8ad3268401 Merge branch 'hotfix/2.10.1.2402.01' into release/2.10.1.2402.01-个税 2024-02-27 11:33:30 +08:00
黎永顺 9120ee93d5 hotfix/2.10.1.2402.01 2024-02-27 11:32:54 +08:00
黎永顺 fbef758824 release/2.10.1.2402.01-个税 2024-02-23 16:30:20 +08:00
黎永顺 72b8c0e128 Merge branch 'release/2.10.1.2402.01' into release/2.10.1.2402.01-个税 2024-02-23 16:21:04 +08:00
黎永顺 6f7b21ce5b feature/2.10.1.2401.01-最优年终奖计税方案 2024-02-23 15:20:22 +08:00
黎永顺 2e2f8ee248 Merge branch 'release/2.10.1.2401.02' into release/2.10.1.2401.02-个税 2024-02-21 15:45:22 +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
黎永顺 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
黎永顺 abfeb1aae7 Merge branch 'feature/2.10.1.2401.01-个税在线对比' into release/2.10.1.2401.01-个税
# Conflicts:
#	pc4mobx/hrmSalary/apis/declare.js
2024-02-02 14:13:01 +08:00
黎永顺 0a680cccc2 Merge branch 'release/2.10.1.2401.01' into release/2.10.1.2401.01-个税
# Conflicts:
#	pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
2024-02-02 13:55:08 +08:00
黎永顺 2a85b3e596 release/2.9.9.2312.02-个税 2024-02-02 13:52:37 +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
黎永顺 13d67c5066 feature/2.10.1.2401.01-工资单查看与调薪记录分开展示 2024-01-26 10:56:23 +08:00
黎永顺 93c17d1a35 feature/2.10.1.2401.01-工资单查看与调薪记录分开展示 2024-01-26 10:25:32 +08:00
黎永顺 240cb316a1 feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置 2024-01-26 09:57:30 +08:00
黎永顺 eb0ed15a15 feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置 2024-01-26 09:38:08 +08:00
黎永顺 fe83bf0286 feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置 2024-01-26 09:30:38 +08:00
黎永顺 1364c52674 feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置 2024-01-25 17:56:56 +08:00
黎永顺 b638aea4b9 feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置 2024-01-25 17:25:36 +08:00
黎永顺 314b3f594c feature/2.10.1.2401.01-工资单查看与调薪记录分开展示 2024-01-25 17:19:51 +08:00
黎永顺 876629e413 Merge branch 'release/2.10.1.2401.01' into feature/2.10.1.2401.01-工资单查看与调薪记录分开展示 2024-01-25 17:13:35 +08:00
黎永顺 866376e7de feature/2.10.1.2401.01-工资单查看与调薪记录分开展示 2024-01-25 16:47:55 +08:00
黎永顺 4242856f0e release/2.10.1.2401.01
薪资档案-非系统人员调薪修改
2024-01-25 16:11:00 +08:00
黎永顺 b82ae4f4ce feature/2.10.1.2401.01-工资单查看与调薪记录分开展示 2024-01-25 15:45:33 +08:00
黎永顺 e86e4871d8 release/2.10.1.2401.01 2024-01-25 15:11:35 +08:00
黎永顺 f50257e1b5 feature/2.10.1.2401.01-工资单查看与调薪记录分开展示 2024-01-25 15:09:30 +08:00
黎永顺 c45f1fe066 Merge branch 'hotfix/2.10.1.2401.01' into release/2.10.1.2401.01 2024-01-25 14:44:39 +08:00