Commit Graph

1279 Commits (c3476e36591448db93cb34d2cd02bff57932b5ca)
 

Author SHA1 Message Date
dxfeng cfe08ddf4c 花名册动态查询SQL 2 years ago
liang.cheng 1249da2b78 Merge pull request '花名册增加按钮' (#126) from feature/cl into develop
Reviewed-on: #126
2 years ago
Chengliang 07786bc2a6 花名册增加按钮 2 years ago
dxfeng 01c042ebbc 高级搜索表单完善 2 years ago
dxfeng 49538d0ccb Merge pull request '花名册高级搜索相关接口' (#125) from feature/dxf into develop
Reviewed-on: #125
2 years ago
dxfeng 503697dd55 花名册高级搜索相关接口 2 years ago
Mlin 1c3b1296b5 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin d1612a151a 花名册自定义字段展示20230106 2 years ago
dxfeng 180e4a714c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng d0990210e6 Merge pull request '花名册高级搜索相关接口' (#124) from feature/dxf into develop
Reviewed-on: #124
2 years ago
dxfeng bf577b6630 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng 3e0d3a1b2e 花名册高级搜索相关接口 2 years ago
Mlin 401a37df64 Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
#	src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
2 years ago
Mlin 2f505e8ca7 花名册自定义字段展示20230106 2 years ago
dxfeng a4dbd108b1 Merge pull request '花名册高级搜索相关接口' (#123) from feature/dxf into develop
Reviewed-on: #123
2 years ago
dxfeng 4d43e0605b Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng 92c51cfe18 花名册高级搜索相关接口 2 years ago
Mlin 00ab437f9e 增加全部人员简历下载条件(去除离职)(20230106) 2 years ago
Mlin c7ce7ea540 优化人员简历目录删除问题(20230105) 2 years ago
Mlin 0ef350c902 人员简历合并导出日志(20230105) 2 years ago
Mlin 95a6b388c4 修复人员简历合并图片重复问题(20230105) 2 years ago
Mlin b515fdb78f 人员简历导出、压缩下载(20230105) 2 years ago
Mlin d81776680f Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
dxfeng bc8a2a4098 Merge pull request '人员筛选接口开发、调整' (#122) from feature/dxf into develop
Reviewed-on: #122
2 years ago
dxfeng b2500cfbd0 人员筛选接口开发、调整 2 years ago
Mlin ab881b8d8f Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
#	src/com/engine/organization/service/PersonnelResumeService.java
#	src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
#	src/com/engine/organization/web/PersonnelResumeController.java
#	src/com/engine/organization/wrapper/PersonnelResumeWrapper.java
2 years ago
Mlin 5450b99e37 人员简历导出下载(20230105) 2 years ago
dxfeng 9adce8b045 Merge pull request '人员筛选接口开发、调整' (#121) from feature/dxf into develop
Reviewed-on: #121
2 years ago
dxfeng 586330f99e 人员筛选接口开发、调整 2 years ago
Mlin 06da61d889 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin 6d1603aeb2 人员简历模板导出20230103 2 years ago
dxfeng 477f6fb1cf Merge pull request '人员简历模板优化' (#120) from feature/dxf into develop
Reviewed-on: #120
2 years ago
dxfeng 05dad18a5a Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng bccae91e75 人员简历模板优化 2 years ago
dxfeng 395d93067a Oracle,SQL脚本BUG修复 2 years ago
Mlin 42d2281c1d Merge branch 'master' into feature/ml 2 years ago
Mlin 90e6d7b765 Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
#	src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
#	src/com/engine/organization/web/PersonnelResumeController.java
#	src/com/engine/organization/wrapper/PersonnelResumeWrapper.java
2 years ago
Mlin a86a8dd2c8 人员简历模板导出 2 years ago
Mlin bc47f697d0 人员简历模板导出 2 years ago
dxfeng 0915ca4ed9 Merge pull request '人员简历相关接口开发' (#119) from feature/dxf into develop
Reviewed-on: #119
2 years ago
dxfeng dde1d0d0db 人员简历相关接口开发 2 years ago
dxfeng 687b580494 人员简历相关接口开发 2 years ago
dxfeng 96503c0a2f Merge pull request '人员简历相关接口开发' (#118) from feature/dxf into develop
Reviewed-on: #118
2 years ago
dxfeng df57b4e71f 人员简历相关接口开发 2 years ago
dxfeng c41716318d 人员简历相关接口开发 2 years ago
dxfeng 702092c5a2 人员简历相关接口开发 2 years ago
dxfeng 207081aca2 Merge pull request '人员简历相关接口开发' (#117) from feature/dxf into develop
Reviewed-on: #117
2 years ago
dxfeng ea22378df0 人员简历相关接口开发 2 years ago
dxfeng 0308e11263 Merge pull request '人员简历相关接口开发' (#116) from feature/dxf into develop
Reviewed-on: #116
2 years ago
dxfeng 33e9073e1c 人员简历相关接口开发 2 years ago