 钱涛
|
e537ffaa5a
|
薪资明细显示模板
|
2024-11-07 17:45:17 +08:00 |
Harryxzy
|
dbb332e07f
|
Merge branch 'release/2.16.1.2410.01' into fix/240901_token加解密
|
2024-11-06 10:05:53 +08:00 |
|
钱涛
|
8c5c3d5949
|
工资单查看限制类型约束
|
2024-10-22 15:00:19 +08:00 |
|
钱涛
|
edb07052b5
|
员工明细排序
|
2024-10-08 14:36:18 +08:00 |
|
钱涛
|
b4050e4ee8
|
报表快照搜索
|
2024-09-29 16:58:41 +08:00 |
|
Harryxzy
|
3420c36448
|
人员id加密
|
2024-09-18 18:10:30 +08:00 |
|
Harryxzy
|
78d4f5e2ae
|
阅后即焚
|
2024-03-11 10:35:56 +08:00 |
|
Harryxzy
|
6c2d20a5a7
|
Merge branch 'feature/240101_我的薪资福利显示页签支持配置' into release/2.11.1.2402.01
|
2024-03-05 14:24:19 +08:00 |
|
Harryxzy
|
a39806bb92
|
我的薪资福利显示页签支持配置
|
2024-02-23 11:04:14 +08:00 |
|
Harryxzy
|
2331ef354e
|
工资单确认和反馈按钮分开
|
2024-01-30 15:53:55 +08:00 |
|
Harryxzy
|
71f90882d3
|
工资单反馈区分pc和移动端
|
2024-01-23 16:45:09 +08:00 |
sy
|
3b761341fc
|
薪酬系统-福利档案，档案导入功能优化，增加基数自动调整逻辑
|
2024-01-10 11:20:36 +08:00 |
|
sy
|
451c9fb07b
|
薪酬系统-福利档案，档案明细获取逻辑改造，根据应用设置中的区分开关，判定后将公司的福利基数信息单独区分返回
|
2023-12-06 09:51:07 +08:00 |
|
Harryxzy
|
df25f99544
|
薪资核算固定列头
|
2023-11-29 16:48:09 +08:00 |
|
钱涛
|
5241972151
|
工资单时效设置
|
2023-10-07 14:46:28 +08:00 |
|
Harryxzy
|
820d15d06f
|
工资单确认反馈
|
2023-07-12 15:17:59 +08:00 |
|
Harryxzy
|
5dc2dadd46
|
工资单自动确认
|
2023-07-11 17:28:15 +08:00 |
|
Harryxzy
|
467746f7df
|
Merge branch 'release/2.9.1.2307.01' into feature/230701-工资单反馈
|
2023-07-10 11:12:03 +08:00 |
|
Harryxzy
|
584ebbc562
|
暂存
|
2023-07-10 11:11:52 +08:00 |
|
Harryxzy
|
0e2a6c8368
|
Merge branch 'feature/taxDeclarationWithdraw' into release/2.9.1.2307.01
# Conflicts:
# src/com/engine/salary/sys/constant/SalarySysConstant.java
# src/com/engine/salary/sys/entity/vo/AppSettingVO.java
# src/com/engine/salary/sys/service/SalarySysConfService.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/web/SalarySystemConfigController.java
# src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
|
2023-07-10 11:10:10 +08:00 |
|
Harryxzy
|
04592a58b4
|
Merge branch 'release/2.8.4.2306.02' into feature/taxDeclarationWithdraw
# Conflicts:
# src/com/engine/salary/sys/constant/SalarySysConstant.java
# src/com/engine/salary/sys/service/SalarySysConfService.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/web/SalarySystemConfigController.java
# src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
|
2023-06-29 16:40:07 +08:00 |
|
Harryxzy
|
ba85231656
|
个税申报撤回开关-1
|
2023-06-29 16:38:50 +08:00 |
|
Harryxzy
|
2735661b4a
|
删除薪资档案
|
2023-06-29 10:35:55 +08:00 |
|
钱涛
|
6f3593f44b
|
Merge branch 'feature/短信验证码' into release/2.8.4.2306.02
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/sys/constant/SalarySysConstant.java
|
2023-06-26 13:54:56 +08:00 |
|
Harryxzy
|
3096954628
|
核算人员匹配规则（是否包含停薪列表）暂存
|
2023-06-16 14:40:36 +08:00 |
|
钱涛
|
912c80c97f
|
验证方式
|
2023-06-14 16:15:05 +08:00 |
|
Harryxzy
|
1294e86c8c
|
导入自动锁定添加开关
|
2023-06-02 15:25:46 +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
|
1fb96be58b
|
个税申报开关
|
2022-11-08 11:22:56 +08:00 |
|
钱涛
|
f2fdbca8f7
|
脱敏表配置
|
2022-11-07 11:31:21 +08:00 |
李栋
|
708a947449
|
薪资档案加密设置加进度
|
2022-10-12 14:24:01 +08:00 |
|
李栋
|
60396e90a3
|
薪资档案加密设置
|
2022-10-10 09:43:57 +08:00 |
|
钱涛
|
23a1396c12
|
核算列表求和
|
2022-09-27 17:43:43 +08:00 |
|
钱涛
|
b812454cd3
|
人员校验规则
|
2022-09-22 10:10:18 +08:00 |
|
钱涛
|
830e099b57
|
排序规则
|
2022-09-19 16:44:32 +08:00 |
|
钱涛
|
a7bd4a43d6
|
排序规则
|
2022-09-19 13:41:09 +08:00 |