 钱涛
|
6edd65a77e
|
Merge branch 'feature/archive' into develop
|
2022-10-18 15:04:45 +08:00 |
|
钱涛
|
a29670d752
|
修复停薪
|
2022-10-18 15:04:29 +08:00 |
李栋
|
9b119a43df
|
薪资档案加密设置多余字段
|
2022-10-18 11:42:54 +08:00 |
|
钱涛
|
4b37775f78
|
档案发薪设置
|
2022-10-18 09:43:58 +08:00 |
|
李栋
|
95dc67e067
|
Merge branch 'dev-LeeD' into develop
|
2022-10-17 19:04:36 +08:00 |
|
李栋
|
679e13c310
|
薪资档案加密设置bug
|
2022-10-17 19:04:14 +08:00 |
sy
|
dad2751490
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-17 17:24:51 +08:00 |
|
sy
|
21fa422350
|
薪酬系统-福利档案结构改造，取消停缴功能优化和导入功能添加runStatus条件
|
2022-10-17 17:24:40 +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 |
|
李栋
|
5c3fe06b62
|
Merge branch 'develop' into dev-LeeD
|
2022-10-17 11:14:33 +08:00 |
|
李栋
|
fc94b50c60
|
薪资档案加密设置
|
2022-10-17 11:14:21 +08:00 |
|
sy
|
b16133f61a
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-17 10:13:59 +08:00 |
|
sy
|
8fa59c2cf9
|
薪酬系统-福利档案结构改造，增员、减员接口返回结果格式调整
|
2022-10-17 10:13:38 +08:00 |
|
钱涛
|
5102d51b09
|
Merge branch 'feature/archive' into develop
|
2022-10-17 10:03:58 +08:00 |
|
sy
|
8d9a00bfff
|
薪酬系统-福利档案结构改造，取消停缴、增员、减员接口入参格式调整
|
2022-10-14 18:00:22 +08:00 |
|
sy
|
3d714c2b8d
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-14 16:34:25 +08:00 |
|
sy
|
8a0e72f99c
|
薪酬系统-福利档案结构改造，档案列表接口返回结果优化
|
2022-10-14 16:34:10 +08:00 |
|
钱涛
|
77fc944491
|
获取保存档案配置表单
保存档案配置
|
2022-10-14 16:18:55 +08:00 |
Harryxzy
|
5233c85c81
|
Merge branch 'origin/feature/updateAndDeleteCustomCategory_xzy' into develop
|
2022-10-14 15:32:30 +08:00 |
|
Harryxzy
|
989dd13216
|
xzy-修改自定义福利名称
|
2022-10-14 15:17:56 +08:00 |
|
sy
|
4701c4de5c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-14 14:31:35 +08:00 |
|
sy
|
e61d4f21c7
|
薪酬系统-福利档案结构改造，待减员页面的减员功能
|
2022-10-14 14:31:09 +08:00 |
|
Harryxzy
|
ab4565f5ce
|
xzy-编辑自定义福利
|
2022-10-13 20:38:05 +08:00 |
|
sy
|
0e6520f838
|
薪酬系统-福利档案结构改造，批量更改福利档案状态功能和取消停缴功能
|
2022-10-13 17:36:15 +08:00 |
|
钱涛
|
0e05185599
|
操作接口
|
2022-10-13 16:24:59 +08:00 |
|
sy
|
b1cdeb0a4f
|
薪酬系统-福利档案结构改造，福利档案中增量数据自动处理功能v2
|
2022-10-13 16:04:54 +08:00 |
|
sy
|
1aaa8ce43e
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-13 14:58:42 +08:00 |
|
钱涛
|
68076fc724
|
fix sqlserver增量数据空
|
2022-10-13 14:57:52 +08:00 |
|
sy
|
053ac67604
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-13 14:45:38 +08:00 |
|
sy
|
fd63c16b93
|
薪酬系统-福利档案结构改造，福利档案中增量数据自动处理功能
|
2022-10-13 14:45:18 +08:00 |
|
sy
|
8d26f2ac46
|
薪酬系统-福利档案结构改造，福利档案中待减员数据自动处理功能
|
2022-10-12 17:17:06 +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 |
|
李栋
|
9ebe1acda9
|
薪资档案加密设置更新
|
2022-10-12 10:55:39 +08:00 |
|
李栋
|
df20bc83e4
|
薪资档案加密设置更新
|
2022-10-12 10:44:39 +08:00 |
|
sy
|
187508c0f9
|
薪酬系统-福利档案结构改造，福利档案各tap页记录数统计功能
|
2022-10-12 10:38:41 +08:00 |
|
李栋
|
2677d40503
|
Merge branch 'develop' into dev-LeeD
|
2022-10-11 17:41:12 +08:00 |
|
李栋
|
9f651b173e
|
薪资档案加密设置更新
|
2022-10-11 17:41:00 +08:00 |
|
钱涛
|
4e06cd585e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-10-11 15:07:47 +08:00 |
|
sy
|
0688b86cc2
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-11 14:50:12 +08:00 |
|
sy
|
e86dba922a
|
薪酬系统-福利档案结构改造，runStatus字段获取问题修复
|
2022-10-11 14:49:54 +08:00 |
|
钱涛
|
a18b008581
|
Merge branch 'develop' into feature/archive
|
2022-10-11 14:43:21 +08:00 |
|
李栋
|
dc541e8e00
|
Merge branch 'develop' into dev-LeeD
|
2022-10-11 09:40:32 +08:00 |
|
李栋
|
7960f74308
|
薪资档案加密设置更新
|
2022-10-11 09:40:23 +08:00 |
|
sy
|
b2284d6669
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-11 09:03:46 +08:00 |
|
钱涛
|
ab575db152
|
Merge branch 'develop' into feature/archive
|
2022-10-10 17:36:29 +08:00 |