 钱涛
|
3a843fc41f
|
Merge branch 'release/3.0.2.2504.01' into custom/联特
|
2025-05-09 16:23:21 +08:00 |
|
钱涛
|
6925e4daea
|
fix冲突
|
2025-05-09 16:21:17 +08:00 |
|
钱涛
|
aa37e174e9
|
Merge branch 'release/个税版本' into custom/联特
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
|
2025-05-09 16:18:18 +08:00 |
|
钱涛
|
8c4fbf7919
|
拼接错误信息
|
2025-05-09 11:45:06 +08:00 |
|
钱涛
|
af89a43da7
|
修复业务线权限
|
2025-04-30 11:04:18 +08:00 |
|
钱涛
|
1a66a1f846
|
版本
|
2025-04-29 16:07:51 +08:00 |
|
钱涛
|
cc510db3cc
|
Merge remote-tracking branch 'origin/custom/联特' into custom/联特
|
2025-04-29 09:20:26 +08:00 |
|
钱涛
|
ecb920de0e
|
去除验证码
|
2025-04-29 09:19:44 +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 |
|
钱涛
|
a1af56bbcc
|
忘记密码
|
2025-04-28 18:08:29 +08:00 |
Harryxzy
|
2bd545964a
|
联特 季度绩效分段计算
|
2025-04-28 10:14:11 +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 |
|
钱涛
|
ee3fd8da8e
|
修复按照扣缴义务人名称检索
|
2025-04-24 16:19:23 +08:00 |
|
钱涛
|
9b9b47de88
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-04-24 16:08:39 +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 |
|
钱涛
|
0bdc48f1c2
|
修复归档后查看拓扑图
|
2025-04-24 11:03:13 +08:00 |
|
钱涛
|
ac2143080f
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java
# src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
# src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
# src/com/engine/salary/web/TaxDeclarationController.java
|
2025-04-23 18:10:26 +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 |
|
钱涛
|
6532bfdd07
|
拓扑图显示非薪资项目数据
|
2025-04-22 15:33:28 +08:00 |
|
钱涛
|
6b90c8c45c
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-04-21 15:50:00 +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 |
|
钱涛
|
ec2d5f6a36
|
人员报送非正常自动添加离职日期
|
2025-04-18 14:28:06 +08:00 |
|
Harryxzy
|
0ed411c532
|
Merge remote-tracking branch 'origin/custom/联特' into custom/联特
|
2025-04-17 17:18:31 +08:00 |
|
Harryxzy
|
16945a4176
|
联特 某些义务人不校验报税
|
2025-04-17 17:11:04 +08:00 |
|
钱涛
|
4e2ea2017b
|
Merge branch 'release/3.0.2.2504.01' into custom/联特
|
2025-04-17 17:11:03 +08:00 |
|
钱涛
|
0eafdbfa4c
|
Merge branch 'release/2.19.1.2501.01' into custom/联特
|
2025-04-17 17:10:51 +08:00 |
|
Harryxzy
|
2e9971c998
|
联特 税款所属期下下月
|
2025-04-17 15:48:09 +08:00 |
|
钱涛
|
083f266a85
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-04-17 14:24:23 +08:00 |
|
钱涛
|
6e366bed5a
|
fix账套列表检索问题
|
2025-04-17 14:20:14 +08:00 |
|
钱涛
|
d01c9bf06f
|
增加扣缴义务人搜索核算列表
|
2025-04-17 11:06:02 +08:00 |
|
钱涛
|
da6364a511
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-04-16 14:06:53 +08:00 |
|
钱涛
|
37445cdd58
|
fix部分发放
|
2025-04-16 14:06:46 +08:00 |
|
Harryxzy
|
99a0c3facc
|
2100bug修复
|
2025-04-16 13:26:36 +08:00 |
|
钱涛
|
b0fb2b3866
|
部分发放
|
2025-04-15 17:49:38 +08:00 |
|
钱涛
|
61beec603e
|
创建推送记录接口；
推送接口；
撤回接口；
|
2025-04-14 17:00:16 +08:00 |
|
钱涛
|
c2fde2b3e4
|
处理冲突
|
2025-04-14 15:50:51 +08:00 |
|
钱涛
|
709ec2f3ce
|
Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
# src/com/engine/salary/service/impl/PushServiceImpl.java
|
2025-04-14 15:50:15 +08:00 |
|
钱涛
|
cca13614e3
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-14 15:46:04 +08:00 |
|
Harryxzy
|
f97c49facc
|
联特 bug修复
|
2025-04-14 15:37:46 +08:00 |
|
Harryxzy
|
0bcafd3934
|
修复个税申报 不同税款所属期校验bug
|
2025-04-09 17:20:48 +08:00 |
|
钱涛
|
be8ede54df
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-09 14:25:43 +08:00 |
|
钱涛
|
c04dad0c4d
|
修改字段名
|
2025-04-09 14:23:38 +08:00 |