‘ml’
|
f2c5d1227b
|
分部、部门、岗位禁用、合并修复1025
|
3 years ago |
|
‘ml’
|
e198209705
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
3 years ago |
 dxfeng
|
b578c66495
|
Merge pull request '更新人员Map表信息' (#24) from feature/dxf into develop
Reviewed-on: #24
|
3 years ago |
|
dxfeng
|
594173175c
|
更新人员Map表信息
|
3 years ago |
|
dxfeng
|
3cf48e443a
|
Merge pull request '人员导入、花名册左侧树BUG修复' (#23) from feature/dxf into develop
Reviewed-on: #23
|
3 years ago |
|
dxfeng
|
b446dbdb53
|
人员导入、花名册左侧树BUG修复
|
3 years ago |
|
‘ml’
|
f30998351f
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/thread/CompanyTriggerRunnable.java
# src/com/engine/organization/thread/DepartmentTriggerRunnable.java
|
3 years ago |
|
‘ml’
|
65ccecce56
|
分部、部门、岗位禁用修复1024
|
3 years ago |
|
dxfeng
|
7e1e1eae5c
|
Merge pull request 'SQL脚本、编制导入模板、人员卡片、组织架构图Oracle' (#22) from feature/dxf into develop
Reviewed-on: #22
|
3 years ago |
|
dxfeng
|
dca18ea5b1
|
编制导入模板、人员卡片、组织架构图Oracle
|
3 years ago |
|
dxfeng
|
d9bdda1fa6
|
SQL脚本调整
|
3 years ago |
|
dxfeng
|
771996f138
|
Merge pull request '人员相关BUG修复' (#21) from feature/dxf into develop
Reviewed-on: #21
|
3 years ago |
|
dxfeng
|
3b4c59ae8c
|
人员相关BUG修复
|
3 years ago |
|
dxfeng
|
2515121d83
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
11a4a85ff1
|
人员关联调整
|
3 years ago |
|
‘ml’
|
05fe14b5e1
|
分部转移、部门转移、岗位合并修复1021
|
3 years ago |
|
‘ml’
|
444153f44d
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
3 years ago |
 liang.cheng
|
89554625ca
|
Merge pull request 'develop' (#20) from develop into master
Reviewed-on: #20
|
3 years ago |
|
liang.cheng
|
1708f8e821
|
Merge pull request '建表' (#19) from feature/cl into develop
Reviewed-on: #19
|
3 years ago |
|
Chengliang
|
545ec88e07
|
建表
|
3 years ago |
|
‘ml’
|
887a1eafe3
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
3 years ago |
|
dxfeng
|
7004300ebb
|
Merge pull request '人员关联调整' (#18) from feature/dxf into develop
Reviewed-on: #18
|
3 years ago |
|
dxfeng
|
275b017db1
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
52c8b86adb
|
人员关联调整
|
3 years ago |
|
‘ml’
|
9a9b79cff0
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
3 years ago |
|
‘ml’
|
a0660a7857
|
分部转移、部门转移、岗位合并修复1020
|
3 years ago |
|
dxfeng
|
c06ea6f2a7
|
Merge pull request '人员关联调整、BUG修复' (#17) from feature/dxf into develop
Reviewed-on: #17
|
3 years ago |
|
dxfeng
|
b7e34c1d31
|
人员关联调整
|
3 years ago |
|
dxfeng
|
a5687b3995
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
1c4ee05f95
|
人事卡片BUG修复
|
3 years ago |
|
‘ml’
|
adc92c8287
|
部门合并在岗数优化1019
|
3 years ago |
|
dxfeng
|
eb007f5b23
|
人事卡片BUG修复
|
3 years ago |
|
‘ml’
|
5005243758
|
部门合并在岗数优化
|
3 years ago |
|
dxfeng
|
95f81a4f00
|
Merge pull request '人员BUG修复' (#16) from feature/dxf into develop
Reviewed-on: #16
|
3 years ago |
|
dxfeng
|
414aefe41c
|
人事卡片BUG修复
|
3 years ago |
|
dxfeng
|
63b6b88a96
|
人员管理BUG修复
|
3 years ago |
|
dxfeng
|
0f57462192
|
Merge pull request 'BUG修复' (#15) from feature/dxf into develop
Reviewed-on: #15
|
3 years ago |
|
dxfeng
|
396a4570d0
|
BUG修复
|
3 years ago |
|
dxfeng
|
85fb8a1d19
|
Merge pull request '人员卡片BUG修复' (#14) from feature/dxf into develop
Reviewed-on: #14
|
3 years ago |
|
dxfeng
|
561477c47e
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
cd4d2c77bf
|
人员卡片BUG修复
|
3 years ago |
|
dxfeng
|
10a3921d54
|
Merge pull request '分部、岗位 禁用功能限制' (#13) from feature/dxf into develop
Reviewed-on: #13
|
3 years ago |
|
dxfeng
|
f36756e1fd
|
分部、岗位 禁用功能限制
|
3 years ago |
|
dxfeng
|
e2d988d83b
|
Merge pull request '部门转移BUG修复' (#12) from feature/dxf into develop
Reviewed-on: #12
|
3 years ago |
|
dxfeng
|
4a85fc46aa
|
部门转移BUG修复
|
3 years ago |
|
dxfeng
|
cb5235a16c
|
Merge pull request '人员卡片' (#11) from feature/dxf into develop
Reviewed-on: #11
|
3 years ago |
|
dxfeng
|
1d7389c872
|
人员卡片
|
3 years ago |
|
dxfeng
|
48c8101a34
|
Merge pull request 'feature/dxf' (#10) from feature/dxf into develop
Reviewed-on: #10
|
3 years ago |
|
dxfeng
|
b2670001b4
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
f9c33da655
|
人员管理完善
|
3 years ago |
