 dxfeng
|
87372be17f
|
组织管理，编制导入BUG修复
|
2 years ago |
|
dxfeng
|
820b13b932
|
Merge pull request 'feature/dxf' (#196) from feature/dxf into develop
Reviewed-on: #196
|
2 years ago |
|
dxfeng
|
46ecec4b17
|
组织管理，岗位台账、岗位浏览按钮列表展示优化
|
2 years ago |
|
dxfeng
|
fab01583ad
|
组织架构图，部门选择树
|
2 years ago |
|
dxfeng
|
f4c29de76b
|
新建编制信息初始化在编数
|
2 years ago |
Mlin
|
2ee38ccc0c
|
版本管理代码优化
|
2 years ago |
 liang.cheng
|
691b4764b4
|
Merge pull request '排序 时间轴' (#195) from feature/cl into develop
Reviewed-on: #195
|
2 years ago |
|
Chengliang
|
d9e2a695cf
|
排序 时间轴
|
2 years ago |
|
Mlin
|
775405741a
|
版本管理，事务控制bug优化
|
2 years ago |
|
Mlin
|
0a809a29c9
|
版本管理，事务控制bug优化
|
2 years ago |
|
Mlin
|
1abbc7cddf
|
版本记录，未新增分部类型、部门类型字段时同步bug修复
|
2 years ago |
|
Mlin
|
7417cbac79
|
虚拟维度表查询bug修复
|
2 years ago |
|
Mlin
|
8ac0f45d29
|
版本记录，虚拟人员bug修复
|
2 years ago |
|
Mlin
|
3d7b5927b3
|
版本记录，虚拟人员bug修复
|
2 years ago |
|
Mlin
|
45b663217f
|
版本记录，分部bug修复
|
2 years ago |
|
Mlin
|
7d1b7b8795
|
版本记录，虚拟人员bug修复
|
2 years ago |
|
dxfeng
|
024d2a1591
|
Merge pull request 'feature/dxf' (#194) from feature/dxf into develop
Reviewed-on: #194
|
2 years ago |
|
dxfeng
|
696f66ec98
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
d510f32bc5
|
组织架构图，BUG修复
|
2 years ago |
|
liang.cheng
|
772287869e
|
Merge pull request 'v3' (#193) from feature/cl into develop
Reviewed-on: #193
|
2 years ago |
|
Chengliang
|
f5275c2148
|
v3
|
2 years ago |
|
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 |
