Mlin
|
725d64888c
|
组织管理版本记录int类型bug修复
|
2 years ago |
|
Mlin
|
971b997dff
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/impl/ChartServiceImpl.java
|
2 years ago |
|
Mlin
|
10a9a350b4
|
组织管理版本记录数据同步
|
2 years ago |
 dxfeng
|
10983ab38a
|
Merge pull request 'feature/dxf' (#192) from feature/dxf into develop
Reviewed-on: #192
|
2 years ago |
|
dxfeng
|
a58e42d83c
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
62b25d6a65
|
组织架构图，回溯详细信息
|
2 years ago |
|
dxfeng
|
7e0553c0d2
|
Merge pull request 'feature/dxf' (#191) from feature/dxf into develop
Reviewed-on: #191
|
2 years ago |
|
dxfeng
|
c61a071746
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
3bf299afa4
|
组织架构图，回溯详细信息
|
2 years ago |
 liang.cheng
|
8906b0753c
|
Merge pull request '列表' (#190) from feature/cl into develop
Reviewed-on: #190
|
2 years ago |
|
Chengliang
|
81f7ecfec9
|
列表
|
2 years ago |
|
dxfeng
|
194ee20b77
|
Merge pull request '组织架构图，回溯详细信息' (#189) from feature/dxf into develop
Reviewed-on: #189
|
2 years ago |
|
dxfeng
|
151e77e69b
|
组织架构图，回溯详细信息
|
2 years ago |
|
dxfeng
|
bfa3d147fc
|
Merge pull request 'feature/dxf' (#188) from feature/dxf into develop
Reviewed-on: #188
|
2 years ago |
|
dxfeng
|
104d94ba6f
|
组织架构图，回溯数据查询
|
2 years ago |
|
dxfeng
|
775cf4a8ae
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
Mlin
|
6befb0de03
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/ChartService.java
# src/com/engine/organization/service/impl/ChartServiceImpl.java
|
2 years ago |
|
Mlin
|
38f3e457ef
|
组织管理版本记录0711
|
2 years ago |
|
liang.cheng
|
60de384cf6
|
Merge pull request 'v3' (#187) from feature/cl into develop
Reviewed-on: #187
|
2 years ago |
|
Chengliang
|
1a188a1975
|
v3
|
2 years ago |
|
dxfeng
|
d4a6fb4a28
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
075456caa9
|
组织架构图，<根结点>添加回溯联动
|
2 years ago |
|
liang.cheng
|
4e5eacfb38
|
Merge pull request 'v3' (#186) from feature/cl into develop
Reviewed-on: #186
|
2 years ago |
|
Chengliang
|
54abf562a4
|
v3
|
2 years ago |
|
liang.cheng
|
914649a35b
|
Merge pull request 'v3' (#185) from feature/cl into develop
Reviewed-on: #185
|
2 years ago |
|
Chengliang
|
688eeb125c
|
v3
|
2 years ago |
|
dxfeng
|
44e684a2a4
|
Merge pull request '组织架构图，兼容PG数据库' (#184) from feature/dxf into develop
Reviewed-on: #184
|
2 years ago |
|
dxfeng
|
c023822ca5
|
组织架构图，兼容PG数据库
|
2 years ago |
|
dxfeng
|
1dc5f3ce4b
|
Merge pull request '组织架构图，添加部门层级条件' (#183) from feature/dxf into develop
Reviewed-on: #183
|
2 years ago |
|
dxfeng
|
a18e7a3dc7
|
组织架构图，添加部门层级条件
|
2 years ago |
|
dxfeng
|
bba7288c5d
|
Merge pull request '组织架构图，岗位调整为查询聚才林岗位' (#182) from feature/dxf into develop
Reviewed-on: #182
|
2 years ago |
|
dxfeng
|
eb28328219
|
组织架构图，岗位调整为查询聚才林岗位
|
2 years ago |
|
dxfeng
|
45c623accd
|
Merge pull request '修复并发情况下，岗位数据重复问题' (#181) from feature/dxf into develop
Reviewed-on: #181
|
2 years ago |
|
dxfeng
|
d9ea8fe266
|
修复并发情况下，岗位数据重复问题
|
2 years ago |
|
dxfeng
|
b3f093a647
|
Merge pull request '组织架构图，人员列表添加key' (#180) from feature/dxf into develop
Reviewed-on: #180
|
2 years ago |
|
dxfeng
|
d2e1cacfa1
|
组织架构图，人员列表添加key
|
2 years ago |
|
dxfeng
|
c7bfa8126a
|
Merge pull request '组织架构图，人员列表显示转换调整' (#179) from feature/dxf into develop
Reviewed-on: #179
|
2 years ago |
|
dxfeng
|
7809f9ad3c
|
组织架构图，人员头像
|
2 years ago |
|
dxfeng
|
14135f0e47
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
436decbc85
|
组织架构图，人员列表显示转换调整
|
2 years ago |
|
dxfeng
|
a3aadebeeb
|
Merge pull request 'feature/dxf' (#178) from feature/dxf into develop
Reviewed-on: #178
|
2 years ago |
|
dxfeng
|
c3476e3659
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
38656dde58
|
组织架构图，部门负责人、主次账号
|
2 years ago |
|
dxfeng
|
79f64f7f93
|
组织架构图，列表字段转换、卡片在岗数统计
|
2 years ago |
|
dxfeng
|
46849d161d
|
Merge pull request '组织架构图，人员卡片' (#177) from feature/dxf into develop
Reviewed-on: #177
|
2 years ago |
|
dxfeng
|
49036ba704
|
组织架构图，人员卡片
|
2 years ago |
|
dxfeng
|
e47e8dd330
|
Merge pull request 'feature/dxf' (#176) from feature/dxf into develop
Reviewed-on: #176
|
2 years ago |
|
dxfeng
|
603f7f606a
|
组织架构图，人员卡片
|
2 years ago |
|
dxfeng
|
5559a4322a
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
e760eae9a0
|
组织架构图，人员卡片
|
2 years ago |
