 钱涛
|
5aeb5bb5e1
|
版本
|
2026-02-11 17:51:25 +08:00 |
|
钱涛
|
2b8f1df51f
|
Merge branch 'release/个税&业务线' into custom/联特
|
2026-02-11 17:50:07 +08:00 |
|
钱涛
|
d3c0dbe7d7
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2026-02-11 17:42:56 +08:00 |
|
钱涛
|
fd29b5ff47
|
人员报送解决报送中的问题
|
2026-02-11 17:42:34 +08:00 |
|
钱涛
|
39feb3c00a
|
人员报送解决报送中的问题
|
2026-02-11 17:42:03 +08:00 |
|
钱涛
|
1d27ad85c3
|
Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
# resource/WEB-INF/prop/hrmSalary.properties
|
2026-02-10 17:51:21 +08:00 |
|
钱涛
|
e770fce758
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2026-02-10 17:50:00 +08:00 |
|
钱涛
|
76dee330be
|
个税月度统计详情
|
2026-02-10 17:48:12 +08:00 |
|
钱涛
|
101bbf11d3
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2026-02-10 16:57:04 +08:00 |
|
钱涛
|
e9719bd012
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2026-02-10 16:56:59 +08:00 |
|
钱涛
|
e47d9eda1e
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2026-02-10 16:54:02 +08:00 |
|
钱涛
|
1c217b05ab
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2026-02-10 16:30:15 +08:00 |
|
钱涛
|
11827aa33a
|
处理人员报送接口失败，删除任务
|
2026-02-10 15:42:08 +08:00 |
|
钱涛
|
50c84eb11e
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2026-02-05 15:03:49 +08:00 |
|
钱涛
|
49738114fc
|
薪资档案初始化导入支持
|
2026-02-05 15:03:31 +08:00 |
|
钱涛
|
829453fd05
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2026-02-03 17:35:33 +08:00 |
|
钱涛
|
eeba5870bd
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2026-02-03 17:25:51 +08:00 |
|
钱涛
|
6de4a4f241
|
修复社保空指针
|
2026-02-03 15:37:24 +08:00 |
|
钱涛
|
acfb8cbfe4
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2026-02-02 15:18:14 +08:00 |
|
钱涛
|
dee1ed1b9c
|
个税云升级
|
2026-02-02 15:17:38 +08:00 |
|
钱涛
|
37b42e75b9
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
# Conflicts:
# resource/WEB-INF/prop/hrmSalary.properties
|
2026-01-29 10:45:06 +08:00 |
|
钱涛
|
d40fa67fc6
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2026-01-29 10:44:13 +08:00 |
|
钱涛
|
1f910b28d3
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2026-01-29 10:43:55 +08:00 |
|
钱涛
|
dee4e13c6c
|
考勤引用设置字段时取消引用考勤
|
2026-01-29 10:43:42 +08:00 |
|
钱涛
|
af03446628
|
个税云升级
取消：不再需要填写“人员状态”（原“正常/非正常”选项）；
新增：是否离职后补发工资：员工有离职日期时可选择“是/否”；
|
2026-01-28 13:48:15 +08:00 |
|
钱涛
|
84f186e665
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2026-01-26 14:34:27 +08:00 |
|
钱涛
|
9858d8e024
|
个税云升级
取消：不再需要填写“人员状态”（原“正常/非正常”选项）；
新增：是否离职后补发工资：员工有离职日期时可选择“是/否”；
|
2026-01-26 14:32:10 +08:00 |
|
钱涛
|
3a2808e420
|
Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
# resource/WEB-INF/prop/hrmSalary.properties
|
2026-01-21 10:41:59 +08:00 |
|
钱涛
|
b3531e4c9e
|
Merge branch 'release/个税版本' into release/个税&业务线
# Conflicts:
# resource/WEB-INF/prop/hrmSalary.properties
|
2026-01-16 14:46:55 +08:00 |
|
钱涛
|
84c504be59
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2026-01-16 14:43:15 +08:00 |
|
钱涛
|
3b772e0f91
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
# Conflicts:
# resource/WEB-INF/prop/hrmSalary.properties
|
2026-01-16 14:42:43 +08:00 |
|
钱涛
|
629ff298a6
|
版本
|
2026-01-16 13:58:58 +08:00 |
|
钱涛
|
8640398252
|
修改oracle token问题
|
2026-01-16 13:58:28 +08:00 |
|
钱涛
|
3e89118af8
|
版本
|
2026-01-15 11:27:14 +08:00 |
|
钱涛
|
cd5ac20d6a
|
Merge branch 'release/个税&业务线' into custom/联特
|
2026-01-15 10:53:52 +08:00 |
|
钱涛
|
c0389245d4
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2026-01-12 10:59:04 +08:00 |
|
钱涛
|
ae731d0bce
|
申报失败原因
|
2026-01-12 10:58:39 +08:00 |
|
钱涛
|
93708f5327
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2026-01-07 15:44:23 +08:00 |
|
钱涛
|
21035c30f4
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2026-01-07 15:10:09 +08:00 |
|
钱涛
|
bd4e0b14e8
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2026-01-07 15:07:50 +08:00 |
|
钱涛
|
eb35dddfbd
|
修复查询问题
|
2026-01-07 15:07:11 +08:00 |
|
钱涛
|
e05288c4c0
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-12-24 17:47:22 +08:00 |
|
钱涛
|
8e7abc1854
|
token日志
|
2025-12-19 16:09:15 +08:00 |
|
钱涛
|
2f8bb00949
|
版本
|
2025-12-19 14:00:48 +08:00 |
|
钱涛
|
4f8fcfc1e1
|
Merge branch 'release/个税&业务线' into custom/联特
|
2025-12-19 13:32:05 +08:00 |
|
钱涛
|
0ba4c40f45
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-12-19 13:31:04 +08:00 |
|
钱涛
|
8b1fe9ed3f
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-12-19 13:30:51 +08:00 |
|
钱涛
|
55c8680ab2
|
修改流量使用量
|
2025-12-19 13:30:11 +08:00 |
|
钱涛
|
ffe8c88392
|
新增token日志
|
2025-12-18 10:19:13 +08:00 |
 dxfeng
|
0cea01300d
|
社保福利台账 导出功能增加筛选条件，工号、部门、分部
|
2025-12-17 10:05:29 +08:00 |