 dxfeng
|
f29ca425ec
|
Merge pull request '岗位分权，部门列表，分部、部门导入BUG修复' (#151) from feature/dxf into develop
Reviewed-on: #151
|
2 years ago |
|
dxfeng
|
29e1ed93f6
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
eaca9535d5
|
分部、部门导入BUG修复
|
2 years ago |
|
dxfeng
|
559ea407ab
|
岗位分权，部门列表BUG修复
|
2 years ago |
|
dxfeng
|
a1a91b2cb8
|
Merge pull request '花名册，状态查询功能完善' (#150) from feature/dxf into develop
Reviewed-on: #150
|
2 years ago |
|
dxfeng
|
6ac651e8bd
|
花名册，状态查询功能完善
|
2 years ago |
|
dxfeng
|
0afff811c0
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
1cc568f738
|
Merge pull request '列定制BUG修复' (#149) from danikor into develop
Reviewed-on: #149
|
2 years ago |
|
dxfeng
|
ec7ff05616
|
列定制BUG修复
|
2 years ago |
|
dxfeng
|
571b0bcdfc
|
Merge pull request '列定制BUG修复' (#148) from danikor into develop
Reviewed-on: #148
|
2 years ago |
|
dxfeng
|
37ded0a19b
|
列定制BUG修复
|
2 years ago |
|
dxfeng
|
d68cfcee95
|
Merge pull request '列定制BUG修复' (#147) from danikor into develop
Reviewed-on: #147
|
2 years ago |
|
dxfeng
|
8947e6da3a
|
列定制BUG修复
|
2 years ago |
|
dxfeng
|
d207134980
|
Merge pull request '列定制BUG修复' (#146) from danikor into develop
Reviewed-on: #146
|
2 years ago |
|
dxfeng
|
5e40c18df1
|
列定制BUG修复
|
2 years ago |
|
dxfeng
|
560c1e0336
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
Mlin
|
4b4754bd74
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
2b5acfeb32
|
花名册模板管理bug修复
|
2 years ago |
|
dxfeng
|
7dc6225356
|
Merge pull request 'BUG修复' (#145) from feature/dxf into develop
Reviewed-on: #145
|
2 years ago |
|
dxfeng
|
d34ed2e5c6
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
ba2909bac9
|
BUG修复
|
2 years ago |
|
Mlin
|
8ff8340d81
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
9d36b42da6
|
花名册模板管理日期优化
|
2 years ago |
|
dxfeng
|
cd2ace5868
|
Merge pull request 'BUG修复' (#144) from feature/dxf into develop
Reviewed-on: #144
|
2 years ago |
|
dxfeng
|
0aac4a0c57
|
BUG修复
|
2 years ago |
|
dxfeng
|
26dfcf39f8
|
Merge pull request 'BUG修复' (#143) from feature/dxf into develop
Reviewed-on: #143
|
2 years ago |
|
dxfeng
|
ec55baf5fe
|
BUG修复
|
2 years ago |
|
dxfeng
|
e9d6a166d3
|
Merge pull request 'BUG修复' (#142) from feature/dxf into develop
Reviewed-on: #142
|
2 years ago |
|
dxfeng
|
6d8aaf063b
|
BUG修复
|
2 years ago |
|
Mlin
|
547264d755
|
花名册模板列定制优化20230113
|
2 years ago |
|
Mlin
|
78682a47c7
|
花名册模板列定制优化20230113
|
2 years ago |
|
Mlin
|
58d5bccddc
|
花名册模板列定制列名称获取优化20230113
|
2 years ago |
|
Mlin
|
07a82baf9c
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
5c44a11ff3
|
花名册模板列定制功能优化20230113
|
2 years ago |
|
dxfeng
|
52c02986c8
|
Merge pull request 'BUG修复' (#141) from feature/dxf into develop
Reviewed-on: #141
|
2 years ago |
|
dxfeng
|
1bb7b67133
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
1c9dce7c0b
|
BUG修复
|
2 years ago |
|
Mlin
|
2fba3b50b9
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
# src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
|
2 years ago |
|
Mlin
|
e3a78a05c7
|
花名册模板列定制20230113
|
2 years ago |
|
dxfeng
|
2d456894b9
|
Merge pull request 'BUG修复' (#140) from feature/dxf into develop
Reviewed-on: #140
|
2 years ago |
|
dxfeng
|
ebb4e88d0d
|
BUG修复
|
2 years ago |
|
dxfeng
|
30615f9727
|
Merge pull request 'BUG修复' (#139) from feature/dxf into develop
Reviewed-on: #139
|
2 years ago |
|
dxfeng
|
f79ad8681f
|
BUG修复
|
2 years ago |
|
dxfeng
|
bcdc52d894
|
Merge pull request '显示定制列穿梭框接口开发' (#138) from feature/dxf into develop
Reviewed-on: #138
|
2 years ago |
|
dxfeng
|
563070a539
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
15b14cf4b1
|
显示定制列穿梭框接口开发
|
2 years ago |
|
Mlin
|
a395024010
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
a677da06a6
|
花名册模板管理查询、编辑保存20230112
|
2 years ago |
|
dxfeng
|
7d96731841
|
Merge pull request '显示定制列穿梭框接口开发' (#137) from feature/dxf into develop
Reviewed-on: #137
|
2 years ago |
|
dxfeng
|
cb814ef077
|
显示定制列穿梭框接口开发
|
2 years ago |
