 钱涛
|
1d27ad85c3
|
Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
# resource/WEB-INF/prop/hrmSalary.properties
|
2026-02-10 17:51:21 +08:00 |
|
钱涛
|
37b42e75b9
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
# Conflicts:
# resource/WEB-INF/prop/hrmSalary.properties
|
2026-01-29 10:45:06 +08:00 |
|
钱涛
|
84f186e665
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2026-01-26 14:34:27 +08:00 |
|
钱涛
|
9858d8e024
|
个税云升级
取消：不再需要填写“人员状态”（原“正常/非正常”选项）；
新增：是否离职后补发工资：员工有离职日期时可选择“是/否”；
|
2026-01-26 14:32:10 +08:00 |
|
钱涛
|
3a2808e420
|
Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
# resource/WEB-INF/prop/hrmSalary.properties
|
2026-01-21 10:41:59 +08:00 |
|
钱涛
|
b3531e4c9e
|
Merge branch 'release/个税版本' into release/个税&业务线
# Conflicts:
# resource/WEB-INF/prop/hrmSalary.properties
|
2026-01-16 14:46:55 +08:00 |
|
钱涛
|
84c504be59
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2026-01-16 14:43:15 +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 |
|
钱涛
|
629ff298a6
|
版本
|
2026-01-16 13:58:58 +08:00 |
|
钱涛
|
3e89118af8
|
版本
|
2026-01-15 11:27:14 +08:00 |
|
钱涛
|
93708f5327
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2026-01-07 15:44:23 +08:00 |
|
钱涛
|
2f8bb00949
|
版本
|
2025-12-19 14:00:48 +08:00 |
|
钱涛
|
63698a5501
|
连续劳务收入版本
|
2025-12-13 09:04:27 +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 |
|
钱涛
|
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 |
|
钱涛
|
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 |
|
钱涛
|
179711bc1a
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-11-06 13:42:29 +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 |
|
钱涛
|
af7ba37b4b
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-10-23 18:32:41 +08:00 |
|
钱涛
|
25f0713bb3
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-10-23 18:32:33 +08:00 |
|
钱涛
|
074ea5cf7f
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-10-21 16:59:19 +08:00 |
|
钱涛
|
038fac392c
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-10-21 16:56:09 +08:00 |
|
钱涛
|
953a590cca
|
常用sql
|
2025-10-21 16:55:42 +08:00 |
|
钱涛
|
0adfa422a4
|
版本
|
2025-10-13 13:47:55 +08:00 |
Harryxzy
|
0c1c3bab6e
|
联特 二开
|
2025-09-08 15:33:15 +08:00 |
Harryxzy
|
fd0808bb0c
|
联特 报表（4张）
|
2025-08-06 18:09:19 +08:00 |
|
钱涛
|
bd3ec879f3
|
Merge branch 'release/个税&业务线' into custom/联特
|
2025-07-11 17:19:32 +08:00 |
|
钱涛
|
2bd092ae11
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-07-11 17:19:10 +08:00 |
|
钱涛
|
ed5f6da8a6
|
缴款需要按照分类分别缴纳
|
2025-07-11 17:18:15 +08:00 |
|
钱涛
|
ec2a057a3c
|
版本
|
2025-07-08 18:31:26 +08:00 |
|
钱涛
|
dd3fe4c821
|
Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
|
2025-07-08 18:30:11 +08:00 |
|
钱涛
|
d3e40d1b9e
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-07-07 10:21:36 +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 |
|
钱涛
|
b55ea81e4e
|
日志
|
2025-07-07 10:20:24 +08:00 |
|
钱涛
|
56e19ea9da
|
Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
# resource/WEB-INF/prop/hrmSalary.properties
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
|
2025-07-02 20:45:41 +08:00 |
|
钱涛
|
2a883868ba
|
Merge branch 'release/个税版本' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
|
2025-07-02 20:08:08 +08:00 |
|
钱涛
|
cb02136ff6
|
免税收入
|
2025-07-01 18:37:50 +08:00 |
|
钱涛
|
53c8909de4
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-25 14:37:22 +08:00 |
|
钱涛
|
45acec8468
|
上线版本
|
2025-06-19 14:40:09 +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 |
|
Harryxzy
|
8e839b23ba
|
Merge remote-tracking branch 'origin/custom/联特' into custom/联特
|
2025-05-12 18:31:09 +08:00 |
|
Harryxzy
|
4c05906f03
|
联特cbs对接
|
2025-05-12 17:42:15 +08:00 |
|
钱涛
|
810cbdbbd5
|
打开修改公式
|
2025-05-11 14:07:26 +08:00 |
|
钱涛
|
603d31b095
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-05-09 16:28:56 +08:00 |