‘ml’
|
52f9e756e6
|
组织透视图虚拟组织修复
|
3 years ago |
 dxfeng
|
3028ae8335
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
9b36018c9a
|
Merge pull request '分权BUG修复' (#38) from feature/dxf into develop
Reviewed-on: #38
|
3 years ago |
|
dxfeng
|
373eebe5d8
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
47aafefa5a
|
分权BUG修复
|
3 years ago |
|
‘ml’
|
5e981c8163
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
3 years ago |
|
‘ml’
|
7d88bb9d5b
|
虚拟组织(新增修改删除接口)
|
3 years ago |
 liang.cheng
|
41370fe770
|
Merge pull request '人员卡片权限接口' (#37) from feature/cl into develop
Reviewed-on: #37
|
3 years ago |
|
Chengliang
|
afcbbcefb1
|
人员卡片权限接口
|
3 years ago |
|
dxfeng
|
d743cafac0
|
Merge pull request '聚才林岗位分权' (#36) from feature/dxf into develop
Reviewed-on: #36
|
3 years ago |
|
dxfeng
|
18767b722c
|
聚才林岗位分权
|
3 years ago |
|
dxfeng
|
a85cc10aab
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
‘ml’
|
1992c1375d
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/impl/OrgChartServiceImpl.java
|
3 years ago |
|
‘ml’
|
8d78af3e14
|
虚拟组织建模表数据写入map
|
3 years ago |
|
liang.cheng
|
121927dba8
|
Merge pull request '人员卡片类型权限' (#35) from feature/cl into develop
Reviewed-on: #35
|
3 years ago |
|
Chengliang
|
b636dc2b82
|
人员卡片类型权限
|
3 years ago |
|
dxfeng
|
f6779ec20a
|
Merge pull request '组织架构图分权功能' (#34) from feature/dxf into develop
Reviewed-on: #34
|
3 years ago |
|
dxfeng
|
c42ac59eaf
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
be90013ca0
|
组织架构图分权功能
|
3 years ago |
|
liang.cheng
|
ac5eb30534
|
Merge pull request '人员卡片权限' (#33) from feature/cl into develop
Reviewed-on: #33
|
3 years ago |
|
Chengliang
|
4e4cf54f8a
|
人员卡片权限
|
3 years ago |
|
dxfeng
|
796487941c
|
Merge pull request '分部、部门、岗位、人员 分权功能开发' (#32) from feature/dxf into develop
Reviewed-on: #32
|
3 years ago |
|
dxfeng
|
895528617b
|
分部、部门、岗位、人员 分权功能开发
|
3 years ago |
|
dxfeng
|
955134dc28
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
Conflicts:
src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java
|
3 years ago |
|
liang.cheng
|
73f3fac3b2
|
Merge pull request '分权开关设置' (#31) from feature/cl into develop
Reviewed-on: #31
|
3 years ago |
|
dxfeng
|
0b3cd0641b
|
分权开发
|
3 years ago |
|
Chengliang
|
1e08772a9d
|
分权开关设置
|
3 years ago |
|
dxfeng
|
157217400f
|
Merge pull request '代码合并' (#30) from feature/dxf into develop
Reviewed-on: #30
|
3 years ago |
|
dxfeng
|
40f1f097e6
|
代码合并
|
3 years ago |
|
liang.cheng
|
19cccb9345
|
Merge pull request 'feature/detach' (#29) from feature/detach into develop
Reviewed-on: #29
|
3 years ago |
|
dxfeng
|
2d40f6be3b
|
Merge pull request '组织架构图相关BUG修复' (#28) from feature/dxf into develop
Reviewed-on: #28
|
3 years ago |
|
dxfeng
|
3989161281
|
组织架构图相关BUG修复
|
3 years ago |
|
Chengliang
|
47c64b6797
|
模块管理分权
|
3 years ago |
|
Chengliang
|
ef392f4d0a
|
模块管理分权
|
3 years ago |
|
‘ml’
|
1be79b9698
|
分部、部门、岗位禁用修复1024
|
3 years ago |
|
‘ml’
|
939e6c7607
|
分部转移、部门转移、岗位合并修复1021
|
3 years ago |
|
Chengliang
|
96cefec891
|
模块管理分权
|
3 years ago |
|
Chengliang
|
f6ea4425cf
|
模块管理分权
|
3 years ago |
|
Chengliang
|
4c74b583bf
|
模块管理分权
|
3 years ago |
|
Chengliang
|
2b975e6636
|
模块管理分权中心接口
|
3 years ago |
|
dxfeng
|
19f3907807
|
Merge pull request '组织架构图相关BUG修复' (#27) from feature/dxf into develop
Reviewed-on: #27
|
3 years ago |
|
dxfeng
|
92b246b5d5
|
组织架构图相关BUG修复
|
3 years ago |
|
dxfeng
|
946a0006b4
|
Merge pull request '组织架构图相关BUG修复' (#26) from feature/dxf into develop
Reviewed-on: #26
|
3 years ago |
|
dxfeng
|
679c77f732
|
组织架构图相关BUG修复
|
3 years ago |
|
dxfeng
|
06179dbaa8
|
Merge pull request '编制、人员编号、岗位部门、自定义下拉框BUG修复' (#25) from feature/dxf into develop
Reviewed-on: #25
|
3 years ago |
|
dxfeng
|
7258ee742d
|
编制模板优化
|
3 years ago |
|
dxfeng
|
b2fc9d3e0c
|
人员编号、岗位部门、自定义下拉框BUG修复
|
3 years ago |
|
dxfeng
|
eeb21315c7
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
a36648ea39
|
花名册树BUG
|
3 years ago |
|
‘ml’
|
f2c5d1227b
|
分部、部门、岗位禁用、合并修复1025
|
3 years ago |
