 钱涛
|
9b68321962
|
Merge branch 'release/3.0.2.2504.01' into custom/新美光
|
2026-03-18 14:13:12 +08:00 |
|
钱涛
|
7b4ab93f4b
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2026-03-12 17:54:49 +08:00 |
|
钱涛
|
50684c9c68
|
重新核算采用税局所属期校验
|
2026-03-12 17:48:50 +08:00 |
|
钱涛
|
5ea2902bba
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2026-03-12 09:44:23 +08:00 |
|
钱涛
|
bc755769a1
|
修复核算导入日志
|
2026-03-12 09:44:02 +08:00 |
|
钱涛
|
034196dd9d
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2026-02-27 17:19:23 +08:00 |
|
钱涛
|
8259cb5eae
|
工资单按照薪资所属月倒序排列
|
2026-02-27 17:17:23 +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 |
|
钱涛
|
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 |
|
钱涛
|
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 |
|
钱涛
|
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 |
|
钱涛
|
8640398252
|
修改oracle token问题
|
2026-01-16 13:58:28 +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 |
|
钱涛
|
8e7abc1854
|
token日志
|
2025-12-19 16:09:15 +08:00 |
|
钱涛
|
ffe8c88392
|
新增token日志
|
2025-12-18 10:19:13 +08:00 |
 dxfeng
|
0cea01300d
|
社保福利台账 导出功能增加筛选条件，工号、部门、分部
|
2025-12-17 10:05:29 +08:00 |
|
钱涛
|
7acdc94380
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-12-05 14:18:59 +08:00 |
|
钱涛
|
b83a916610
|
修复null
|
2025-12-05 14:18:39 +08:00 |
|
钱涛
|
e7923a2486
|
修复业务线查询
|
2025-12-03 17:34:05 +08:00 |
|
钱涛
|
eebfa5ec3f
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-12-02 14:56:21 +08:00 |
|
钱涛
|
10a11dcca4
|
处理社保补缴手动填写异常
|
2025-12-02 14:55:50 +08:00 |
|
钱涛
|
cf68e118fa
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-12-02 10:22:35 +08:00 |
|
钱涛
|
cb423962a2
|
报表穿透，按照薪资所属月排序
|
2025-12-02 10:22:14 +08:00 |
|
钱涛
|
d1abbad832
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-11-28 17:48:21 +08:00 |
|
钱涛
|
00fc87ffd8
|
修复生成年终奖申报表null
|
2025-11-28 15:41:42 +08:00 |
|
钱涛
|
5377a472cc
|
社保方案更新日志
|
2025-11-26 17:20:17 +08:00 |
|
钱涛
|
9f0c00ef25
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-11-24 17:20:43 +08:00 |
|
钱涛
|
85e0b85871
|
批量操作
|
2025-11-24 17:20:11 +08:00 |
|
钱涛
|
37ff12bf6a
|
报表
|
2025-11-18 09:34:24 +08:00 |
|
钱涛
|
20bd294397
|
考勤引用数据范围100
|
2025-11-12 14:57:46 +08:00 |
|
钱涛
|
44b5113ae9
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-11-06 11:28:17 +08:00 |
|
钱涛
|
e6a474261c
|
补缴信息提示优化
|
2025-11-06 11:27:41 +08:00 |
|
钱涛
|
e537107538
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-11-03 13:36:55 +08:00 |
|
钱涛
|
3dd8db37dc
|
账套sql类型的人员范围接入状态
|
2025-11-03 13:35:06 +08:00 |
|
钱涛
|
310be11f43
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-10-27 11:23:09 +08:00 |
|
钱涛
|
f1bd47f8b7
|
修复核算多条件问题
|
2025-10-27 11:22:51 +08:00 |
|
钱涛
|
a74227f12a
|
action日志
|
2025-10-23 10:44:50 +08:00 |
|
钱涛
|
9205c736ba
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-10-17 17:29:50 +08:00 |
|
钱涛
|
014cdd7618
|
增加有序map
|
2025-10-17 17:29:31 +08:00 |
|
钱涛
|
6300f098e5
|
薪资档案增加离职日期
|
2025-10-14 15:15:07 +08:00 |
|
钱涛
|
1001812f07
|
Merge branch 'feature/薪资档案增加离职日期' into custom/新美光
# Conflicts:
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
|
2025-10-14 13:43:17 +08:00 |
|
钱涛
|
f5f84a9ec3
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-10-09 13:38:17 +08:00 |
|
钱涛
|
e3d6cbe5a1
|
批量锁定人员列
|
2025-09-30 16:40:20 +08:00 |
|
钱涛
|
60755a9a0b
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-09-18 16:32:28 +08:00 |
|
钱涛
|
fbce286c17
|
修复字段管理分权问题
|
2025-09-18 16:31:58 +08:00 |
Harryxzy
|
f57582da52
|
修复业务线搜索bug
|
2025-09-18 15:38:13 +08:00 |