Harryxzy
|
77f7640a24
|
社保台账进度条key增加义务人id
|
2024-12-09 17:13:29 +08:00 |
 钱涛
|
2932df22e9
|
推送明细
|
2024-12-09 16:55:22 +08:00 |
|
钱涛
|
b3dcafa6f1
|
版本号
|
2024-12-09 15:12:33 +08:00 |
|
Harryxzy
|
3fa6205c11
|
Merge remote-tracking branch 'origin/release/2.18.1.2412.01' into release/2.18.1.2412.01
|
2024-12-09 14:35:15 +08:00 |
|
Harryxzy
|
d52e13f09e
|
薪资明细报表增加证件号码
|
2024-12-09 14:34:57 +08:00 |
|
钱涛
|
887531ba5d
|
Merge branch 'feature/权限' into feature/数据推送
# Conflicts:
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
|
2024-12-09 14:26:32 +08:00 |
|
钱涛
|
7c1e314f2c
|
保存核算人员时增加快照数据
|
2024-12-09 14:20:52 +08:00 |
|
钱涛
|
4100ba1331
|
保存核算人员时增加快照数据
|
2024-12-09 13:21:25 +08:00 |
|
Harryxzy
|
7d346aa4b0
|
fix非系统人员导入薪资档案时，employeetype为null
|
2024-12-06 16:33:52 +08:00 |
|
钱涛
|
0b6a832c4f
|
组织信息替换
|
2024-12-06 16:05:51 +08:00 |
|
钱涛
|
5b8562edb6
|
组织快照
|
2024-12-06 16:00:53 +08:00 |
|
钱涛
|
de5af5f2c9
|
组织快照
|
2024-12-06 16:00:05 +08:00 |
|
钱涛
|
dff42953b5
|
Merge branch 'release/2.17.1.2411.01' into feature/组织快照
|
2024-12-05 15:21:28 +08:00 |
|
钱涛
|
ec0e74a8eb
|
系统模板bug修改
|
2024-12-05 10:26:37 +08:00 |
|
钱涛
|
5fedafc67e
|
系统模板配置
|
2024-12-05 10:17:12 +08:00 |
|
钱涛
|
0114bdeb3f
|
系统模板配置
|
2024-12-04 17:45:56 +08:00 |
|
钱涛
|
f000148af7
|
Merge branch 'feature/薪资报表明细页面配置' into release/2.17.1.2411.01
|
2024-12-04 15:54:04 +08:00 |
|
钱涛
|
85e3d414fe
|
查询组织信息快照
|
2024-12-04 15:41:11 +08:00 |
|
钱涛
|
051a38d408
|
社保和薪资档案支持定时任务增员
|
2024-12-04 11:46:00 +08:00 |
|
钱涛
|
3e3350bcd6
|
删除模板功能
|
2024-12-04 10:14:39 +08:00 |
|
钱涛
|
c80d900339
|
模板管理列表
|
2024-12-04 09:13:41 +08:00 |
|
钱涛
|
c3b71201a4
|
组织快照
|
2024-12-03 16:39:02 +08:00 |
|
钱涛
|
583f3fa85a
|
Merge branch 'release/2.17.1.2411.01' into feature/权限
# Conflicts:
# src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
|
2024-12-03 12:14:25 +08:00 |
|
钱涛
|
3d61bfa9a6
|
薪资报表明细显示定制列配置
|
2024-12-03 10:45:03 +08:00 |
|
钱涛
|
09b5dee199
|
模板权限
|
2024-12-02 15:01:06 +08:00 |
|
钱涛
|
186473f9f6
|
数据推送服务
|
2024-12-02 14:08:03 +08:00 |
|
钱涛
|
4606e11754
|
数据推送列表和明细列表
|
2024-11-29 10:10:25 +08:00 |
|
钱涛
|
ff3d569e1d
|
数据推送列表和明细列表
|
2024-11-29 09:14:04 +08:00 |
|
钱涛
|
17ceeef74d
|
数据推送明细状态
|
2024-11-28 15:30:36 +08:00 |
|
Harryxzy
|
9daa406d83
|
优化token接口，避免不配时报错
|
2024-11-28 13:33:03 +08:00 |
|
钱涛
|
3ba1ea6cc7
|
推送记录状态
|
2024-11-28 09:41:10 +08:00 |
|
钱涛
|
866dc1c6ff
|
薪资项目分页功能
|
2024-11-27 11:13:20 +08:00 |
|
钱涛
|
1e2d37ad2e
|
推送明细
|
2024-11-27 09:02:24 +08:00 |
|
钱涛
|
b652dbbc8b
|
处理报表空指针
|
2024-11-26 18:14:41 +08:00 |
|
钱涛
|
74b78a3ab5
|
推送记录
|
2024-11-26 18:05:19 +08:00 |
|
钱涛
|
035209afa8
|
推送记录
|
2024-11-26 16:47:51 +08:00 |
|
钱涛
|
94da757524
|
Merge branch 'release/2.17.1.2411.01' into feature/数据推送
# Conflicts:
# src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
|
2024-11-26 14:21:02 +08:00 |
|
钱涛
|
5d458356a5
|
Merge remote-tracking branch 'origin/release/2.17.1.2411.01' into release/2.17.1.2411.01
|
2024-11-26 13:50:20 +08:00 |
|
钱涛
|
79ed6a3226
|
定制列恢复默认设置
|
2024-11-26 13:50:10 +08:00 |
|
Harryxzy
|
607fd2c6a2
|
Merge remote-tracking branch 'origin/release/2.17.1.2411.01' into release/2.17.1.2411.01
|
2024-11-26 13:30:04 +08:00 |
|
钱涛
|
12df33960a
|
修改默认列设置功能
|
2024-11-25 18:05:18 +08:00 |
|
钱涛
|
de5a00f588
|
修改默认列设置功能
|
2024-11-25 16:04:19 +08:00 |
|
钱涛
|
33cc898257
|
刷新数据bug
|
2024-11-25 13:40:00 +08:00 |
|
钱涛
|
38b283e9ba
|
推送记录
|
2024-11-22 10:59:16 +08:00 |
|
钱涛
|
119d9f3cd8
|
推送日志功能
|
2024-11-21 11:54:47 +08:00 |
|
钱涛
|
7ea1e5fc80
|
建模列表接口
|
2024-11-21 10:25:37 +08:00 |
|
钱涛
|
2fe7b7dc03
|
Merge branch 'release/2.17.1.2411.01' into feature/数据推送
|
2024-11-20 18:43:59 +08:00 |
|
钱涛
|
dd77a2f11b
|
数据推送
|
2024-11-20 17:03:41 +08:00 |
|
Harryxzy
|
04fb5edade
|
浮动薪酬字符、数值限制
|
2024-11-20 11:28:14 +08:00 |
|
钱涛
|
e4e3fb4bec
|
数据推送
|
2024-11-19 19:34:41 +08:00 |