Commit Graph

737 Commits (2fba3b50b98205b9a0146a31222bdea0f0042232)

Author SHA1 Message Date
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 ebb4e88d0d BUG修复 2 years ago
dxfeng f79ad8681f BUG修复 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 cb814ef077 显示定制列穿梭框接口开发 2 years ago
dxfeng b93a3d7b1c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng a7b1f33e1a 显示定制列穿梭框接口开发 2 years ago
Mlin 044f963f31 Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
#	src/com/engine/organization/service/HrmResourceService.java
#	src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
#	src/com/engine/organization/web/HrmResourceController.java
#	src/com/engine/organization/wrapper/HrmResourceWrapper.java
2 years ago
Mlin 8750850dfa 花名册列定制模板查询20230112 2 years ago
Mlin 09d4dbddd5 花名册列定制模板查询20230112 2 years ago
dxfeng 0f73f6e3ac 显示定制列穿梭框接口开发 2 years ago
dxfeng d5ca665f2f 显示定制列穿梭框接口开发 2 years ago
Mlin f86562c802 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin 71c427d1ec 花名册自定义字段展示20230111 2 years ago
dxfeng 4076a755f1 花名册高级搜索BUG修复 2 years ago
Mlin 12bcd367c7 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
dxfeng 6e1f70ef82 花名册高级搜索BUG修复 2 years ago
dxfeng 1d053a0437 花名册高级搜索BUG修复 2 years ago
dxfeng 832fb2b9c4 花名册高级搜索BUG修复 2 years ago
dxfeng f7ce6b028a 花名册高级搜索BUG修复 2 years ago
dxfeng 9dbce1e8c5 花名册高级搜索BUG修复 2 years ago
dxfeng 4ba6d5c21e 花名册高级搜索BUG修复 2 years ago
dxfeng 9e6cc7da2a Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng cfe08ddf4c 花名册动态查询SQL 2 years ago
Chengliang 07786bc2a6 花名册增加按钮 2 years ago
dxfeng 01c042ebbc 高级搜索表单完善 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 3e0d3a1b2e 花名册高级搜索相关接口 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 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 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 bccae91e75 人员简历模板优化 2 years ago
dxfeng 395d93067a Oracle,SQL脚本BUG修复 2 years ago