 钱涛
|
59a38954bc
|
Merge branch 'feature/个人养老金' into release/2.7.3.2304.01
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java
|
2023-04-13 09:35:29 +08:00 |
|
钱涛
|
a4a829d201
|
年终奖数据
|
2023-04-11 17:24:31 +08:00 |
|
钱涛
|
bb76df3718
|
个人养老金
|
2023-04-04 17:29:56 +08:00 |
sy
|
0427ec5ed4
|
薪酬系统, 关闭加密方法优化
|
2023-03-30 11:44:21 +08:00 |
|
钱涛
|
9b8e89bf9f
|
去除lang3
|
2023-03-03 14:55:26 +08:00 |
|
钱涛
|
affa437506
|
加密显示配置
|
2023-02-23 15:18:33 +08:00 |
|
钱涛
|
84e63d4d40
|
加密日志
|
2023-02-21 13:58:30 +08:00 |
|
钱涛
|
830304fabb
|
系统配置
|
2023-01-09 14:41:10 +08:00 |
Harryxzy
|
43511f7922
|
Merge branch 'feature/V3-backItem-1215' into release/2.4.2.2212.03
|
2022-12-21 16:39:55 +08:00 |
fcli
|
beeadfc35c
|
feat: 加解密处理
|
2022-12-14 14:55:57 +08:00 |
|
Harryxzy
|
4fa7f9a5e7
|
回算-加解密开关
|
2022-12-14 14:45:24 +08:00 |
|
fcli
|
d3de862d11
|
feat: 加密统一,薪资项目&社保档案详情...
|
2022-12-13 17:14:27 +08:00 |
|
钱涛
|
8dc2ddc3c8
|
加密方法
|
2022-12-12 09:37:15 +08:00 |
|
Harryxzy
|
15749ecc10
|
Merge branch 'feature/V2-taxDeclarationSwitch-11-10' into release/2.1.3.2211.03
# Conflicts:
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
|
2022-11-10 11:25:01 +08:00 |
|
Harryxzy
|
9dab99d3c5
|
个税申报功能-fix重启后回到开启
|
2022-11-10 10:28:03 +08:00 |
|
Harryxzy
|
1abd3d47f2
|
个税申报功能-重启状态前端展示开启
|
2022-11-10 10:14:29 +08:00 |
|
Harryxzy
|
3d4be3265e
|
个税申报功能-重启
|
2022-11-10 09:46:30 +08:00 |
|
钱涛
|
f5622df8fe
|
Merge branch 'feature/report1110' into release/2.1.3.2211.03
# Conflicts:
# src/com/engine/salary/sys/entity/param/AppSettingSaveParam.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
|
2022-11-09 19:03:14 +08:00 |
|
Harryxzy
|
095a0665b8
|
Merge branch 'feature/V2-taxDeclarationSwitch-11-10' into release/2.1.3.2211.03
|
2022-11-09 16:12:35 +08:00 |
|
fcli
|
0b26eeec7e
|
fix: 加解密处理
|
2022-11-09 14:32:00 +08:00 |
|
Harryxzy
|
8a704a9f5b
|
个税申报开关-添加新建判断
|
2022-11-08 16:27:29 +08:00 |
|
Harryxzy
|
0630fb7b7d
|
个税申报开关-查询是否开启
|
2022-11-08 13:58:21 +08:00 |
|
Harryxzy
|
1fb96be58b
|
个税申报开关
|
2022-11-08 11:22:56 +08:00 |
|
钱涛
|
f2fdbca8f7
|
脱敏表配置
|
2022-11-07 11:31:21 +08:00 |
李栋
|
9b119a43df
|
薪资档案加密设置多余字段
|
2022-10-18 11:42:54 +08:00 |
|
李栋
|
679e13c310
|
薪资档案加密设置bug
|
2022-10-17 19:04:14 +08:00 |
|
李栋
|
ab074a0354
|
薪资档案加密设置bug
|
2022-10-17 14:18:01 +08:00 |
|
李栋
|
40720fc3e9
|
薪资档案加密设置bug
|
2022-10-17 14:15:20 +08:00 |
|
李栋
|
b11ef914b5
|
薪资档案加密设置bug
|
2022-10-17 13:53:37 +08:00 |
|
李栋
|
1910a77ce1
|
薪资档案加密设置
|
2022-10-17 11:46:59 +08:00 |
|
李栋
|
fc94b50c60
|
薪资档案加密设置
|
2022-10-17 11:14:21 +08:00 |
|
李栋
|
918441fb38
|
薪资档案加密设置加进度
|
2022-10-12 14:36:21 +08:00 |
|
李栋
|
708a947449
|
薪资档案加密设置加进度
|
2022-10-12 14:24:01 +08:00 |
|
李栋
|
3026833d2b
|
薪资档案加密设置更新
|
2022-10-12 11:17:30 +08:00 |
|
李栋
|
df20bc83e4
|
薪资档案加密设置更新
|
2022-10-12 10:44:39 +08:00 |
|
李栋
|
4f4535778e
|
薪资档案加密设置
|
2022-10-10 10:00:59 +08:00 |
|
李栋
|
60396e90a3
|
薪资档案加密设置
|
2022-10-10 09:43:57 +08:00 |
|
钱涛
|
e48f576617
|
显示应用设置接口
|
2022-09-28 10:08:51 +08:00 |
|
钱涛
|
23a1396c12
|
核算列表求和
|
2022-09-27 17:43:43 +08:00 |
|
钱涛
|
1573fc5bcf
|
人员状态枚举适配
|
2022-09-22 11:42:02 +08:00 |
|
钱涛
|
b812454cd3
|
人员校验规则
|
2022-09-22 10:10:18 +08:00 |
|
钱涛
|
f678aa46d6
|
薪资档案排序
|
2022-09-19 18:21:34 +08:00 |
|
钱涛
|
830e099b57
|
排序规则
|
2022-09-19 16:44:32 +08:00 |
|
钱涛
|
a7bd4a43d6
|
排序规则
|
2022-09-19 13:41:09 +08:00 |
|
钱涛
|
23e89d15ec
|
定制
|
2022-09-15 15:43:47 +08:00 |
|
钱涛
|
b61b83976d
|
1、系统详情接口
|
2022-09-15 15:41:48 +08:00 |
|
钱涛
|
d238502b2c
|
1、修复线下对比
2、系统配置
|
2022-09-15 15:15:34 +08:00 |
|
钱涛
|
8c0b9038d6
|
1、系统配置列表
2、修复调薪周期对于核算的结果不准确
|
2022-09-14 11:28:17 +08:00 |
|
钱涛
|
a4e6042adf
|
调薪流程按钮
|
2022-08-24 20:00:57 +08:00 |
|
钱涛
|
7d79dcdfc2
|
修复社保福利列表高级搜索
|
2022-08-11 10:27:15 +08:00 |