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 |
 钱涛
|
0b566561a0
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-06-19 11:05:09 +08:00 |
|
钱涛
|
f5b1768438
|
利息股息红利所得sql
|
2025-06-19 10:49:29 +08:00 |
|
钱涛
|
ef1bfbdc25
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-18 17:22:14 +08:00 |
|
钱涛
|
c7e295e1d2
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-06-18 17:21:51 +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 |
|
钱涛
|
5f3c5f82b8
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-18 13:33:24 +08:00 |
|
钱涛
|
c27105aa21
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-06-18 13:33:02 +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 |
|
钱涛
|
c3d6ac8b66
|
分类所得-上市公司股息红利所得(沪市、深市、创业板)
分类所得-其他利息股息红利所得
|
2025-06-17 17:25:27 +08:00 |
|
钱涛
|
d4ff9af8b7
|
分类所得-上市公司股息红利所得(沪市、深市、创业板)
分类所得-其他利息股息红利所得
|
2025-06-17 11:23:30 +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 |
|
Harryxzy
|
ed88d3c531
|
联特调整
|
2025-06-13 14:47:27 +08:00 |
|
Harryxzy
|
447d682b4e
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-06-13 09:32:11 +08:00 |
|
钱涛
|
3dc9f327df
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-12 11:04:58 +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 |
|
钱涛
|
eb26e556a3
|
Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
# src/com/engine/salary/util/excel/ExcelUtilPlus.java
|
2025-06-10 10:55:00 +08:00 |
|
钱涛
|
d35b6df42b
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-06-10 10:54:19 +08:00 |
|
钱涛
|
2cc43b8983
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-10 10:54:11 +08:00 |
|
钱涛
|
a16a16d13a
|
Merge branch 'release/3.0.2.2504.01' into custom/联特
# Conflicts:
# src/com/engine/salary/util/excel/ExcelUtilPlus.java
|
2025-06-10 10:53:55 +08:00 |
|
Harryxzy
|
6b5aebb6dd
|
联特修复已推送状态
|
2025-06-10 10:39:13 +08:00 |
|
钱涛
|
adbdb64b4c
|
补偿金自动生成免税附表
|
2025-06-06 11:07:33 +08:00 |
|
钱涛
|
9af6178636
|
对“是否雇员”字段为“其他”时的场景做了调整。新增了一个字段 ”其他情况说明“
|
2025-06-06 10:27:16 +08:00 |
|
Harryxzy
|
5aefe5272d
|
联特 流程获取数据接口
|
2025-06-05 10:48:28 +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 |
|
钱涛
|
a5b693041f
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-05-21 11:37:40 +08:00 |
|
钱涛
|
c6633005aa
|
个税版本取消系统算税
|
2025-05-21 11:37:25 +08:00 |
|
钱涛
|
0e87fc2a0f
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-05-20 16:50:48 +08:00 |
|
钱涛
|
a89dee3c1e
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/util/excel/ExcelUtilPlus.java
|
2025-05-20 16:49:24 +08:00 |
|
钱涛
|
9c06f080c5
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/util/excel/ExcelUtilPlus.java
|
2025-05-20 16:47:54 +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 |
|
钱涛
|
445fce498a
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-05-20 16:20:31 +08:00 |
|
钱涛
|
9bb7c7f7f5
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-05-20 16:20:25 +08:00 |
|
Harryxzy
|
3b6a6222c9
|
Merge remote-tracking branch 'origin/custom/联特' into custom/联特
|
2025-05-16 11:14:14 +08:00 |