 钱涛
|
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 |
|
钱涛
|
63698a5501
|
连续劳务收入版本
|
2025-12-13 09:04:27 +08:00 |
|
钱涛
|
152fd5de55
|
Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
# src/com/engine/salary/service/SalaryAcctRecordService.java
|
2025-12-12 16:47:53 +08:00 |
|
钱涛
|
90f6e24386
|
连续劳务收入版本
|
2025-12-12 16:47:24 +08:00 |
|
钱涛
|
18c8a88744
|
Merge branch 'release/3.0.2.2504.01' into custom/联特
# Conflicts:
# resource/WEB-INF/prop/hrmSalary.properties
# src/com/engine/salary/service/SalaryAcctRecordService.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/web/TaxDeclarationController.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2025-12-12 15:55:20 +08:00 |
|
钱涛
|
6a0909ef3a
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-12-12 15:47:58 +08:00 |
|
钱涛
|
688f518e83
|
连续劳务收入版本
|
2025-12-12 15:47:11 +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 |
|
钱涛
|
911085477d
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-11-20 16:21:58 +08:00 |
|
钱涛
|
84e57edee1
|
常见sql
|
2025-11-18 17:52:26 +08:00 |
|
钱涛
|
9555de6acf
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-11-18 10:58:27 +08:00 |
|
钱涛
|
37ff12bf6a
|
报表
|
2025-11-18 09:34:24 +08:00 |
|
钱涛
|
4b717e9b2c
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-11-13 11:38:08 +08:00 |
|
钱涛
|
6a061592e5
|
处理pg脚本
|
2025-11-13 11:37:46 +08:00 |
|
钱涛
|
20bd294397
|
考勤引用数据范围100
|
2025-11-12 14:57:46 +08:00 |
|
钱涛
|
179711bc1a
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-11-06 13:42:29 +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 |
|
钱涛
|
0a1acc89d3
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-10-29 15:46:38 +08:00 |
|
钱涛
|
b4994dab3f
|
常用sql
|
2025-10-29 15:46:24 +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 |