 钱涛
|
0036b086d4
|
短信验证码
|
2025-09-04 10:15:11 +08:00 |
|
钱涛
|
5441909b5a
|
短信验证码
|
2025-09-04 10:13:13 +08:00 |
|
钱涛
|
78a94bb265
|
Merge branch 'release/3.0.2.2504.01' into custom/西部信托
|
2025-09-03 14:22:07 +08:00 |
|
钱涛
|
e603883635
|
短信验证码
|
2025-09-03 14:21:35 +08:00 |
|
钱涛
|
fab703bda3
|
Merge branch 'release/3.0.2.2504.01' into custom/西部信托
|
2025-09-02 15:20:50 +08:00 |
|
钱涛
|
70732f38a9
|
短信验证码
|
2025-09-02 15:17:39 +08:00 |
|
钱涛
|
644b34ba29
|
Merge branch 'release/3.0.2.2504.01' into custom/西部信托
# Conflicts:
# resource/WEB-INF/prop/hrmSalary.properties
|
2025-08-29 10:58:09 +08:00 |
Harryxzy
|
3775dbe686
|
修复业务线版本 报表分享问题
|
2025-08-26 16:04:27 +08:00 |
|
钱涛
|
d1d2130a52
|
参数解析工具
|
2025-08-25 16:40:47 +08:00 |
|
Harryxzy
|
e225965e33
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-07-09 10:09:10 +08:00 |
|
Harryxzy
|
fb239f34ed
|
修复薪资核算筛选为空时导出报错
|
2025-07-09 10:08:27 +08:00 |
|
Harryxzy
|
cbdc483c4c
|
薪酬报表浏览框根据业务线分权
|
2025-07-07 14:01:05 +08:00 |
|
钱涛
|
9830b156a5
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-07-07 10:21:09 +08:00 |
|
钱涛
|
8168a42b61
|
日志
|
2025-07-07 10:20:53 +08:00 |
|
Harryxzy
|
5cc0dda5f6
|
修复业务线版本个税申报bug
|
2025-06-27 13:45:57 +08:00 |
|
Harryxzy
|
2cd9484069
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-06-19 17:28:50 +08:00 |
|
Harryxzy
|
bfd953d082
|
水印单独配置分部不显示
|
2025-06-19 17:28:09 +08:00 |
|
钱涛
|
45acec8468
|
上线版本
|
2025-06-19 14:40:09 +08:00 |
|
Harryxzy
|
904c053d2c
|
Merge remote-tracking branch 'origin/release/3.0.2.2504.01' into release/3.0.2.2504.01
|
2025-06-19 11:39:42 +08:00 |
|
Harryxzy
|
71a3ba4569
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-06-19 11:39:25 +08:00 |
|
Harryxzy
|
e402029f6c
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-06-19 11:38:40 +08:00 |
|
Harryxzy
|
63c9558331
|
修复社保上下限校验 漏掉只开启了公司没开启个人的场景
|
2025-06-19 11:38:05 +08:00 |
|
钱涛
|
d4e6e111fc
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-06-18 17:21:35 +08:00 |
|
钱涛
|
f7cba636b3
|
修复默认值保留位数
|
2025-06-18 17:21:22 +08:00 |
|
钱涛
|
a8c6e8e59e
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-06-18 13:32:41 +08:00 |
|
钱涛
|
919ade5715
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-06-18 13:32:17 +08:00 |
|
钱涛
|
de5caded9e
|
修复工资单性别问题
|
2025-06-18 13:32:12 +08:00 |
|
Harryxzy
|
1263514a81
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-06-16 18:06:40 +08:00 |
|
Harryxzy
|
c2f2390013
|
修复薪资明细导出，合计行统计文本字段
|
2025-06-16 16:41:38 +08:00 |
|
钱涛
|
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 |