Harryxzy
|
a711c2f557
|
联特工资单发生校验修改
|
2025-05-16 11:13:46 +08:00 |
 钱涛
|
f117f888b9
|
Merge branch 'release/个税版本' into custom/联特
|
2025-05-15 14:08:40 +08:00 |
|
钱涛
|
4a2821d793
|
离职日期允许导入清空
|
2025-05-15 14:08:12 +08:00 |
|
Harryxzy
|
ec0905d514
|
联特，cbs推送
|
2025-05-14 15:48:22 +08:00 |
|
Harryxzy
|
97e90e0a81
|
Merge remote-tracking branch 'origin/custom/联特' into custom/联特
|
2025-05-14 15:03:51 +08:00 |
|
钱涛
|
24c67ddaf3
|
二开，人员报送刷新不引用停薪人员
|
2025-05-14 11:30:49 +08:00 |
|
Harryxzy
|
e2839767fa
|
联特，cbs推送
|
2025-05-14 11:06:07 +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 |
|
Harryxzy
|
6cfeed52f6
|
联特修复
|
2025-05-13 15:57:00 +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 |
|
Harryxzy
|
888472d5e0
|
联特cbs对接
|
2025-05-13 11:05:10 +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 |
|
钱涛
|
48712d7d37
|
打印人员报送反馈
|
2025-05-12 15:24:21 +08:00 |
|
钱涛
|
810cbdbbd5
|
打开修改公式
|
2025-05-11 14:07:26 +08:00 |
|
钱涛
|
8f2ff5e63d
|
Merge branch 'release/个税&业务线' into custom/联特
|
2025-05-09 19:47:12 +08:00 |
|
钱涛
|
3e49c412ea
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-05-09 19:47:02 +08:00 |
|
钱涛
|
24e7cbb32e
|
处理申报人次
|
2025-05-09 19:46:32 +08:00 |
|
钱涛
|
d296fba3e9
|
二开，人员报送，刷新不采集税期当月或者之后月份
|
2025-05-09 19:43:44 +08:00 |
|
钱涛
|
df093e606c
|
二开，自离账套不参与申报
|
2025-05-09 17:59:40 +08:00 |
|
钱涛
|
223049c9c5
|
Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
|
2025-05-09 16:31:23 +08:00 |
|
钱涛
|
582a370170
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-05-09 16:29:05 +08:00 |
|
钱涛
|
603d31b095
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-05-09 16:28:56 +08:00 |
|
钱涛
|
f6428be044
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-05-09 16:23:53 +08:00 |
|
钱涛
|
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 |
|
钱涛
|
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 |
|
钱涛
|
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 |
|
钱涛
|
c7cadd2b98
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-25 17:40:03 +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 |
|
钱涛
|
a2ead2346e
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/service/impl/PushServiceImpl.java
|
2025-04-24 17:36:03 +08:00 |
|
钱涛
|
508012c82b
|
修复数据推送查询问题
|
2025-04-24 17:35:22 +08:00 |
|
钱涛
|
efd2eafd1e
|
修复数据推送分页问题
|
2025-04-24 16:45:24 +08:00 |
|
钱涛
|
e54b775d69
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-04-24 16:19:54 +08:00 |
|
钱涛
|
d03c67644a
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-24 16:19:50 +08:00 |