fcli
|
8f39d5d12a
|
Merge branch 'feature/加密方法' into feature/加密方法&分页merge
|
2022-12-16 10:01:09 +08:00 |
|
fcli
|
78447c002b
|
feat: 继承类问题修改
|
2022-12-16 10:01:00 +08:00 |
|
fcli
|
5295821dc1
|
Merge branch 'feature/加密方法' into feature/加密方法&分页merge
|
2022-12-16 09:46:55 +08:00 |
|
fcli
|
68f9c8b9db
|
feat: 继承类问题修改
|
2022-12-16 09:46:39 +08:00 |
 钱涛
|
02f3c164a3
|
Merge branch 'release/2.4.1.2212.02'
|
2022-12-16 09:25:58 +08:00 |
sy
|
237f42f2ae
|
薪酬系统-福利台账，核算进度条逻辑优化
|
2022-12-15 18:03:28 +08:00 |
|
sy
|
cf08bbd842
|
薪酬系统-福利台账，补差相关加解密替换为新方法
|
2022-12-15 17:11:38 +08:00 |
|
sy
|
0787fb4d05
|
Merge remote-tracking branch 'remotes/origin/release/2.4.1.2212.02' into feature/v3-siAccountBalance-1208
# Conflicts:
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2022-12-15 17:08:21 +08:00 |
|
钱涛
|
b59ba320df
|
人员去重
|
2022-12-15 16:59:00 +08:00 |
Harryxzy
|
b9b0a6f1c5
|
回算批量更新
|
2022-12-15 11:32:32 +08:00 |
|
Harryxzy
|
41a3583d61
|
修复回算按钮
|
2022-12-15 11:12:36 +08:00 |
|
sy
|
7b22cb8818
|
Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountBalance-1208
|
2022-12-15 10:55:57 +08:00 |
|
Harryxzy
|
4ed3f47b36
|
薪资账套修改回算公式后不生效问题
|
2022-12-14 22:34:12 +08:00 |
|
Harryxzy
|
5f37281757
|
添加backcalctype
|
2022-12-14 18:21:25 +08:00 |
|
钱涛
|
c71b73799a
|
取消插件
|
2022-12-14 15:02:22 +08:00 |
|
fcli
|
7f7f4442ca
|
Merge branch 'feature/加密方法' into feature/加密方法&分页merge
|
2022-12-14 14:56:24 +08:00 |
|
fcli
|
beeadfc35c
|
feat: 加解密处理
|
2022-12-14 14:55:57 +08:00 |
|
Harryxzy
|
4fa7f9a5e7
|
回算-加解密开关
|
2022-12-14 14:45:24 +08:00 |
|
Harryxzy
|
2136bbbd7f
|
Merge branch 'feature/加密方法&分页merge' into feature/V3-backItem-1215
|
2022-12-14 13:57:21 +08:00 |
|
Harryxzy
|
27602626cf
|
回算加密
|
2022-12-14 13:57:03 +08:00 |
|
fcli
|
b162afcbdd
|
Merge branch 'feature/加密方法' into feature/加密方法&分页merge
|
2022-12-14 13:51:22 +08:00 |
|
fcli
|
ad3f7595bd
|
feat: 空指针处理
|
2022-12-14 13:51:01 +08:00 |
|
Harryxzy
|
75220416bc
|
merge new解密
|
2022-12-14 12:32:42 +08:00 |
|
Harryxzy
|
0130b83f00
|
Merge branch 'feature/加密方法&分页merge' into feature/V3-backItem-1215
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2022-12-14 12:21:42 +08:00 |
|
fcli
|
d039781b74
|
feat: develop处理合并
|
2022-12-14 11:03:33 +08:00 |
|
fcli
|
dea2353ef2
|
Merge branch 'feature/变更分页' into feature/加密方法&分页merge
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SalaryArchiveItemBiz.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
# src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
|
2022-12-14 10:57:41 +08:00 |
|
fcli
|
d3de862d11
|
feat: 加密统一,薪资项目&社保档案详情...
|
2022-12-13 17:14:27 +08:00 |
|
sy
|
1e31dad7ad
|
薪酬系统-福利档案，待减员页面删除待办功能优化
|
2022-12-13 16:58:35 +08:00 |
|
Harryxzy
|
3b6418263f
|
薪资账套复制-薪资回算
薪资核算-回算部分四舍五入
|
2022-12-13 16:39:39 +08:00 |
|
fcli
|
1c6acb497c
|
feat: 加密统一，累计附加扣除详细
|
2022-12-13 10:49:51 +08:00 |
|
fcli
|
eabc983100
|
feat: 加密统一，社保福利档案&薪资核算结果
|
2022-12-13 10:15:31 +08:00 |
|
sy
|
32cffdccf5
|
薪酬系统-福利档案，批量减员逻辑变更，自动减员逻辑变更，无福利方案时，不关注最终缴纳月
|
2022-12-12 17:53:05 +08:00 |
|
sy
|
1fb706b7da
|
薪酬系统-福利档案，删除待办功能添加批量处理逻辑
|
2022-12-12 16:55:22 +08:00 |
|
fcli
|
1431308cc5
|
feat: 加密统一，薪资核算结果
|
2022-12-12 16:42:44 +08:00 |
|
sy
|
1b376464c4
|
薪酬系统-福利档案，删除待办功能（待减员页面）
|
2022-12-12 15:43:12 +08:00 |
|
fcli
|
93db32b758
|
feat: 加密统一，累计附加扣除&社保福利模块
|
2022-12-12 15:40:01 +08:00 |
|
sy
|
ae72d25431
|
Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountBalance-1208
|
2022-12-12 13:43:16 +08:00 |
|
钱涛
|
5e893160b4
|
加密方法
|
2022-12-12 10:36:06 +08:00 |
|
fcli
|
b58e71989d
|
feat: 统一修改到内存分页
|
2022-12-12 10:25:55 +08:00 |
|
钱涛
|
8dc2ddc3c8
|
加密方法
|
2022-12-12 09:37:15 +08:00 |
|
钱涛
|
309cb2047d
|
配置文件
|
2022-12-09 15:28:29 +08:00 |
|
sy
|
43157d25e3
|
薪酬系统-福利台账，补差列表v1
|
2022-12-09 14:50:29 +08:00 |
|
钱涛
|
389022e0ea
|
配置文件
|
2022-12-09 10:12:25 +08:00 |
|
钱涛
|
77d3046966
|
所有个税扣缴义务人的树形
|
2022-12-08 17:48:46 +08:00 |
|
钱涛
|
30e8fd3733
|
流程中个税扣缴义务人已处理
|
2022-12-08 16:48:37 +08:00 |
|
fcli
|
8e2e85a986
|
Merge remote-tracking branch 'origin/release/2.3.2.2212.01' into release/2.3.2.2212.01
|
2022-12-08 16:43:06 +08:00 |
|
fcli
|
cc105ca051
|
Merge branch 'feat/SalarySendRange' into release/2.3.2.2212.01
|
2022-12-08 16:41:04 +08:00 |
|
fcli
|
269bfeee18
|
feat: 查询列表加快
|
2022-12-08 16:39:57 +08:00 |
|
fcli
|
89574f278b
|
feat: 查询列表加快
|
2022-12-08 16:31:16 +08:00 |
|
sy
|
0399731b9b
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountCompensation-1201' into release/2.3.2.2212.01
|
2022-12-08 16:25:28 +08:00 |