Commit Graph

1608 Commits (a6b10dcd8e64e5b5b18a9bd8861fd1daadb75d82)
 

Author SHA1 Message Date
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
dxfeng 76f1501a28 Merge pull request '人员简历相关接口开发' (#115) from feature/dxf into develop
Reviewed-on: #115
2 years ago
dxfeng b53007b7c2 人员简历相关接口开发 2 years ago
dxfeng ce352679f9 Merge pull request '人员简历相关接口开发' (#114) from feature/dxf into develop
Reviewed-on: #114
2 years ago
dxfeng 2e39235515 人员简历相关接口开发 2 years ago
Mlin 950da74ac8 人员岗位显示bug修复 2 years ago
Mlin 347e3505d1 多个部门负责人存入版本bug修复 2 years ago
Mlin 7b9a82dda9 多部门负责人截取显示bug修复 2 years ago
Mlin 4a0949b6b1 多部门负责人截取显示bug修复 2 years ago
Mlin 18b50a4431 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin d231bf3bd3 多部门负责人截取显示 2 years ago
dxfeng 452cfeecc6 Merge pull request '人员导出BUG' (#113) from feature/dxf into develop
Reviewed-on: #113
2 years ago
dxfeng 8c6becc29c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
Mlin fbac015a99 部门转移岗位重复bug修复 2 years ago
dxfeng eac5424171 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng 23eae34062 人员导出BUG 2 years ago
dxfeng a19c2f2f26 Merge pull request '部门导入BUG修复' (#112) from feature/dxf into develop
Reviewed-on: #112
2 years ago
dxfeng a6ed99fc60 部门导入BUG修复 2 years ago
Mlin 33106aaaec sqlserver版本存入、部门转移 2 years ago
dxfeng 5791e53fb5 Merge pull request '多部门负责人BUG修复' (#111) from feature/dxf into develop
Reviewed-on: #111
2 years ago
dxfeng b7938cfb6b 多部门负责人BUG修复 2 years ago
dxfeng f237400510 Merge pull request '职等职级BUG修复' (#110) from feature/dxf into develop
Reviewed-on: #110
2 years ago