liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,226 Commits 23 Branches 0 Tags 6.7 MiB
Commit Graph

1226 Commits

Author SHA1 Message Date
dxfeng 01c042ebbc 高级搜索表单完善 2023-01-09 10:27:30 +08:00
dxfeng 49538d0ccb Merge pull request '花名册高级搜索相关接口' (#125) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/125
 2023-01-06 17:41:22 +08:00
dxfeng 503697dd55 花名册高级搜索相关接口 2023-01-06 17:40:23 +08:00
Mlin 1c3b1296b5 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-06 17:27:07 +08:00
Mlin d1612a151a 花名册自定义字段展示20230106 2023-01-06 17:27:02 +08:00
dxfeng 180e4a714c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-01-06 17:24:45 +08:00
dxfeng d0990210e6 Merge pull request '花名册高级搜索相关接口' (#124) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/124
 2023-01-06 17:21:12 +08:00
dxfeng bf577b6630 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-01-06 17:20:47 +08:00
dxfeng 3e0d3a1b2e 花名册高级搜索相关接口 2023-01-06 17:20:29 +08:00
Mlin 401a37df64 Merge remote-tracking branch 'origin/develop' into feature/ml 
# Conflicts:
#	src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
 2023-01-06 15:54:34 +08:00
Mlin 2f505e8ca7 花名册自定义字段展示20230106 2023-01-06 15:49:58 +08:00
dxfeng a4dbd108b1 Merge pull request '花名册高级搜索相关接口' (#123) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/123
 2023-01-06 15:37:51 +08:00
dxfeng 4d43e0605b Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-01-06 15:35:56 +08:00
dxfeng 92c51cfe18 花名册高级搜索相关接口 2023-01-06 15:35:38 +08:00
Mlin 00ab437f9e 增加全部人员简历下载条件（去除离职）（20230106） 2023-01-06 15:32:31 +08:00
Mlin c7ce7ea540 优化人员简历目录删除问题（20230105） 2023-01-05 16:25:54 +08:00
Mlin 0ef350c902 人员简历合并导出日志（20230105） 2023-01-05 16:00:28 +08:00
Mlin 95a6b388c4 修复人员简历合并图片重复问题（20230105） 2023-01-05 15:34:39 +08:00
Mlin b515fdb78f 人员简历导出、压缩下载（20230105） 2023-01-05 14:55:31 +08:00
Mlin d81776680f Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-05 14:06:44 +08:00
dxfeng bc8a2a4098 Merge pull request '人员筛选接口开发、调整' (#122) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/122
 2023-01-05 14:06:16 +08:00
dxfeng b2500cfbd0 人员筛选接口开发、调整 2023-01-05 14:05:31 +08:00
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
 2023-01-05 14:02:46 +08:00
Mlin 5450b99e37 人员简历导出下载（20230105） 2023-01-05 13:57:52 +08:00
dxfeng 9adce8b045 Merge pull request '人员筛选接口开发、调整' (#121) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/121
 2023-01-04 16:51:36 +08:00
dxfeng 586330f99e 人员筛选接口开发、调整 2023-01-04 16:50:59 +08:00
Mlin 06da61d889 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-03 11:41:33 +08:00
Mlin 6d1603aeb2 人员简历模板导出20230103 2023-01-03 11:41:21 +08:00
dxfeng 477f6fb1cf Merge pull request '人员简历模板优化' (#120) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/120
 2023-01-03 10:33:48 +08:00
dxfeng 05dad18a5a Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-01-03 10:32:29 +08:00
dxfeng bccae91e75 人员简历模板优化 2023-01-03 10:32:11 +08:00
dxfeng 395d93067a Oracle,SQL脚本BUG修复 2023-01-03 10:01:19 +08:00
Mlin 42d2281c1d Merge branch 'master' into feature/ml 2022-12-30 14:26:19 +08:00
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
 2022-12-30 14:22:14 +08:00
Mlin a86a8dd2c8 人员简历模板导出 2022-12-30 14:19:16 +08:00
Mlin bc47f697d0 人员简历模板导出 2022-12-30 14:14:47 +08:00
dxfeng 0915ca4ed9 Merge pull request '人员简历相关接口开发' (#119) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/119
 2022-12-30 10:41:54 +08:00
dxfeng dde1d0d0db 人员简历相关接口开发 2022-12-30 10:40:42 +08:00
dxfeng 687b580494 人员简历相关接口开发 2022-12-30 10:38:47 +08:00
dxfeng 96503c0a2f Merge pull request '人员简历相关接口开发' (#118) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/118
 2022-12-30 10:23:18 +08:00
dxfeng df57b4e71f 人员简历相关接口开发 2022-12-30 10:20:08 +08:00
dxfeng c41716318d 人员简历相关接口开发 2022-12-30 10:16:48 +08:00
dxfeng 702092c5a2 人员简历相关接口开发 2022-12-30 09:39:16 +08:00
dxfeng 207081aca2 Merge pull request '人员简历相关接口开发' (#117) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/117
 2022-12-29 18:17:46 +08:00
dxfeng ea22378df0 人员简历相关接口开发 2022-12-29 17:49:37 +08:00
dxfeng 0308e11263 Merge pull request '人员简历相关接口开发' (#116) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/116
 2022-12-29 15:53:57 +08:00
dxfeng 33e9073e1c 人员简历相关接口开发 2022-12-29 15:52:08 +08:00
dxfeng 76f1501a28 Merge pull request '人员简历相关接口开发' (#115) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/115
 2022-12-28 15:40:59 +08:00
dxfeng b53007b7c2 人员简历相关接口开发 2022-12-28 15:40:23 +08:00
dxfeng ce352679f9 Merge pull request '人员简历相关接口开发' (#114) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/114
 2022-12-28 14:15:07 +08:00