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

1257 Commits

Author SHA1 Message Date
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
dxfeng 2e39235515 人员简历相关接口开发 2022-12-28 14:13:56 +08:00
Mlin 950da74ac8 人员岗位显示bug修复 2022-12-22 11:26:09 +08:00
Mlin 347e3505d1 多个部门负责人存入版本bug修复 2022-12-21 16:26:21 +08:00
Mlin 7b9a82dda9 多部门负责人截取显示bug修复 2022-12-21 15:45:49 +08:00
Mlin 4a0949b6b1 多部门负责人截取显示bug修复 2022-12-21 15:13:16 +08:00
Mlin 18b50a4431 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-21 14:54:07 +08:00
Mlin d231bf3bd3 多部门负责人截取显示 2022-12-21 14:53:56 +08:00
dxfeng 452cfeecc6 Merge pull request '人员导出BUG' (#113) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/113
 2022-12-21 13:44:45 +08:00
dxfeng 8c6becc29c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-21 13:41:42 +08:00
Mlin fbac015a99 部门转移岗位重复bug修复 2022-12-21 13:40:19 +08:00
dxfeng eac5424171 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-21 13:39:13 +08:00
dxfeng 23eae34062 人员导出BUG 2022-12-21 13:38:53 +08:00
dxfeng a19c2f2f26 Merge pull request '部门导入BUG修复' (#112) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/112
 2022-12-21 11:07:34 +08:00
dxfeng a6ed99fc60 部门导入BUG修复 2022-12-21 11:06:14 +08:00
Mlin 33106aaaec sqlserver版本存入、部门转移 2022-12-21 10:58:49 +08:00
dxfeng 5791e53fb5 Merge pull request '多部门负责人BUG修复' (#111) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/111
 2022-12-20 18:18:39 +08:00
dxfeng b7938cfb6b 多部门负责人BUG修复 2022-12-20 18:17:40 +08:00
dxfeng f237400510 Merge pull request '职等职级BUG修复' (#110) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/110
 2022-12-20 16:54:25 +08:00
dxfeng 4ca7eeb93c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-20 16:52:52 +08:00