 钱涛
|
a2f3d57ee5
|
二开版本
|
2025-06-16 09:57:49 +08:00 |
Harryxzy
|
d8cbd1d525
|
考勤引用日志
|
2025-06-12 17:15:53 +08:00 |
|
Harryxzy
|
4f7b7a6cb6
|
Merge branch 'feature/250101_编辑个税申报表' into custom/西部信托
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
|
2025-06-12 16:46:27 +08:00 |
|
Harryxzy
|
cc8ea5946c
|
Merge branch 'feature/250601_考勤引用编辑' into custom/西部信托
|
2025-06-12 16:45:31 +08:00 |
|
Harryxzy
|
9daf89f81c
|
考勤引用日志
|
2025-06-12 16:42:45 +08:00 |
|
Harryxzy
|
aae8208283
|
个税申报表编辑操作日志
|
2025-06-12 14:25:10 +08:00 |
|
Harryxzy
|
4cbf022a34
|
解决冲突
|
2025-06-12 13:32:53 +08:00 |
|
Harryxzy
|
4b9e75e306
|
Merge branch 'feature/250601_考勤引用编辑' into custom/西部信托
|
2025-06-12 13:28:44 +08:00 |
|
Harryxzy
|
2135989cdb
|
Merge branch 'feature/250101_编辑个税申报表' into custom/西部信托
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
|
2025-06-12 13:27:06 +08:00 |
|
Harryxzy
|
2c39a1fa12
|
toMap空指针bug
|
2025-06-12 10:25:31 +08:00 |
|
Harryxzy
|
84339ab715
|
定时任务查询超1000bug
|
2025-06-10 17:35:44 +08:00 |
|
Harryxzy
|
367d538570
|
编辑个税申报表
|
2025-06-10 13:31:36 +08:00 |
|
Harryxzy
|
5099b51325
|
考勤引用编辑
|
2025-06-09 11:39:20 +08:00 |
|
Harryxzy
|
0153134b9c
|
考勤引用编辑
|
2025-06-04 09:18:00 +08:00 |
|
Harryxzy
|
af64d39fa7
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-29 10:56:23 +08:00 |
|
Harryxzy
|
aff5dbf185
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-05-29 10:39:32 +08:00 |
|
Harryxzy
|
578842aa39
|
修复数据穿透过滤条件
|
2025-05-29 10:39:06 +08:00 |
|
钱涛
|
61153309ca
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-27 15:57:28 +08:00 |
|
钱涛
|
1026ff1aae
|
fix邮件中数据为null
|
2025-05-27 15:56:33 +08:00 |
|
钱涛
|
5ebae4208a
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-27 10:54:54 +08:00 |
|
钱涛
|
d9982d2508
|
fix邮件中数据为null
|
2025-05-27 10:46:11 +08:00 |
|
钱涛
|
5435a5a736
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-26 10:37:47 +08:00 |
|
钱涛
|
93dc70de26
|
fix邮件中数据为null
|
2025-05-26 10:36:38 +08:00 |
|
钱涛
|
79f23e4e5a
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-20 16:45:46 +08:00 |
|
钱涛
|
81e87ec9ce
|
优化，导出时过滤空字符串
|
2025-05-20 16:44:46 +08:00 |
|
Harryxzy
|
bb84021758
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-13 16:29:02 +08:00 |
|
Harryxzy
|
05e92add4a
|
修复明细导出
|
2025-05-13 16:07:46 +08:00 |
|
钱涛
|
a0f85ea367
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-13 13:14:54 +08:00 |
|
钱涛
|
7de3dca2a3
|
撤回的工资单不允许查看
|
2025-05-13 13:14:30 +08:00 |
|
钱涛
|
ac1a767a29
|
版本
|
2025-05-09 10:19:58 +08:00 |
|
钱涛
|
98556e3a90
|
修改oracle去除;
|
2025-05-09 10:13:08 +08:00 |
|
钱涛
|
af89a43da7
|
修复业务线权限
|
2025-04-30 11:04:18 +08:00 |
|
钱涛
|
48632444fe
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-04-30 08:59:31 +08:00 |
|
钱涛
|
ca75a5f403
|
fix导出明细
|
2025-04-29 16:57:33 +08:00 |
|
钱涛
|
1a66a1f846
|
版本
|
2025-04-29 16:07:51 +08:00 |
|
钱涛
|
23b1fae3a3
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-04-28 18:15:00 +08:00 |
|
钱涛
|
bc8e80b4e6
|
增加ＳＵＢＳＴＲ拦截处理
|
2025-04-28 18:14:17 +08:00 |
|
Harryxzy
|
344571997f
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-04-24 17:50:17 +08:00 |
|
Harryxzy
|
25c8479d53
|
修复社保福利台账线下对比和核算人数不匹配问题
|
2025-04-24 17:48:54 +08:00 |
|
钱涛
|
508012c82b
|
修复数据推送查询问题
|
2025-04-24 17:35:22 +08:00 |
|
钱涛
|
99f6c43f25
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
|
2025-04-24 16:04:13 +08:00 |
|
钱涛
|
22f494fe12
|
修复按照扣缴义务人名称检索
|
2025-04-24 16:02:34 +08:00 |
|
钱涛
|
491a746c75
|
申报表税款所属期检索和申报
|
2025-04-23 17:45:14 +08:00 |
|
钱涛
|
2fe958f5db
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
|
2025-04-23 17:42:08 +08:00 |
|
钱涛
|
7a7030a91c
|
申报表税款所属期检索和申报
|
2025-04-23 17:39:30 +08:00 |
|
钱涛
|
6e6606f3ac
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-04-21 15:49:39 +08:00 |
|
钱涛
|
552cee8a6f
|
修复合并计税问题
|
2025-04-21 15:49:28 +08:00 |
|
钱涛
|
0e93cbab04
|
t
|
2025-04-21 10:37:44 +08:00 |
|
钱涛
|
64ad0a30d4
|
修复sql部署异常
|
2025-04-21 10:33:06 +08:00 |
|
钱涛
|
4d56cde7a9
|
版本
|
2025-04-17 15:34:29 +08:00 |