 liang.cheng
|
37b09954c6
|
Merge pull request 'develop' (#58) from develop into master
Reviewed-on: #58
|
2 years ago |
|
liang.cheng
|
c9b82b5f71
|
Merge pull request 'bug修复' (#56) from feature/cl into develop
Reviewed-on: #56
|
2 years ago |
|
Chengliang
|
d236127f31
|
bug修复
|
2 years ago |
‘ml’
|
091f202eac
|
职务导入
|
2 years ago |
 dxfeng
|
16794bf98c
|
人员卡片按钮保存
|
2 years ago |
|
liang.cheng
|
4e915f272b
|
Merge pull request 'sql' (#55) from feature/cl into develop
Reviewed-on: #55
|
2 years ago |
|
Chengliang
|
2bf63c689e
|
sql
|
2 years ago |
|
dxfeng
|
7c5d6bfa19
|
Merge pull request '人员卡片按钮自定义' (#54) from feature/dxf into develop
Reviewed-on: #54
|
2 years ago |
|
dxfeng
|
854a40b7cd
|
人员卡片按钮自定义
|
2 years ago |
|
dxfeng
|
afc54c6d1e
|
Merge pull request '人员卡片按钮自定义' (#53) from feature/dxf into develop
Reviewed-on: #53
|
2 years ago |
|
dxfeng
|
b7217dae23
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
d16f13405c
|
人员卡片按钮自定义
|
2 years ago |
|
‘ml’
|
1baf55e04f
|
职级职等导入更新
|
2 years ago |
|
‘ml’
|
33fe824cae
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
‘ml’
|
9517ad15d6
|
优化职级模板字段顺序
|
2 years ago |
|
liang.cheng
|
003dd59cea
|
Merge pull request 'sql增加' (#52) from feature/cl into develop
Reviewed-on: #52
|
2 years ago |
|
Chengliang
|
94c1102c91
|
sql增加
|
2 years ago |
|
‘ml’
|
ba2434b130
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
‘ml’
|
0459c628ea
|
职等职级导入接口20221111
|
2 years ago |
|
dxfeng
|
76081c3213
|
Merge pull request '人员卡片按钮权限' (#51) from feature/dxf into develop
Reviewed-on: #51
|
2 years ago |
|
dxfeng
|
57d788d807
|
人员卡片按钮权限
|
2 years ago |
|
liang.cheng
|
f2ea296832
|
Merge pull request 'bug修复' (#50) from feature/cl into develop
Reviewed-on: #50
|
2 years ago |
|
Chengliang
|
8e93568aa4
|
bug修复
|
2 years ago |
|
‘ml’
|
0da123fcef
|
Merge branch 'feature/ml' into develop
# Conflicts:
# src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
|
2 years ago |
|
‘ml’
|
ec8be58a45
|
职等职级导入接口
|
2 years ago |
|
liang.cheng
|
8f7e9889a8
|
Merge pull request '接口' (#49) from feature/cl into develop
Reviewed-on: #49
|
2 years ago |
|
Chengliang
|
eeefde07ed
|
接口
|
2 years ago |
|
dxfeng
|
13345f7c50
|
Merge pull request '卡片分组权限' (#48) from feature/dxf into develop
Reviewed-on: #48
|
2 years ago |
|
dxfeng
|
fa1434a64a
|
卡片分组权限
|
2 years ago |
|
dxfeng
|
f1be7ad454
|
Merge pull request '代码还原' (#47) from feature/dxf into develop
Reviewed-on: #47
|
2 years ago |
|
dxfeng
|
dcf8418edb
|
代码还原
|
2 years ago |
|
dxfeng
|
8a5ce6ed96
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
0e41f08327
|
组织架构图搜索下拉框、集团负责人BUG修复
|
2 years ago |
|
‘ml’
|
ddafc854b6
|
修复组织机构图虚拟组织不显示
|
2 years ago |
|
dxfeng
|
2b317e3d67
|
Merge pull request '岗位按钮 人员字段权限 人员卡片权限' (#45) from feature/dxf into develop
Reviewed-on: #45
|
2 years ago |
|
dxfeng
|
466ba43b31
|
人员卡片类别展示权限控制
|
2 years ago |
|
dxfeng
|
a6952f41b0
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
b0021dae20
|
字段允许个人修改
|
2 years ago |
|
liang.cheng
|
c2a1908c10
|
Merge pull request 'bug修复' (#44) from feature/cl into develop
Reviewed-on: #44
|
2 years ago |
|
Chengliang
|
99f849f350
|
bug修复
|
2 years ago |
|
dxfeng
|
a3a0ce8046
|
岗位按钮、人员字段权限
|
2 years ago |
|
dxfeng
|
22fa6a60c7
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
3813c8b54a
|
Merge pull request '岗位按钮、组织架构图 BUG修复' (#43) from feature/dxf into develop
Reviewed-on: #43
|
2 years ago |
|
dxfeng
|
9a163f1742
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
c03a7c599a
|
岗位按钮、组织架构图 BUG修复
|
2 years ago |
|
‘ml’
|
a82a41bf64
|
修复组织机构图虚拟组织不显示
|
2 years ago |
|
liang.cheng
|
a5295a68cf
|
Merge pull request '人员卡片菜单权限接口' (#42) from feature/cl into develop
Reviewed-on: #42
|
2 years ago |
|
Chengliang
|
dc347c755d
|
人员卡片菜单权限接口
|
2 years ago |
|
‘ml’
|
b9ff329ceb
|
虚拟组织(建模)删除接口优化
|
2 years ago |
|
dxfeng
|
6c15f7fc3c
|
Merge pull request '分权BUG修复' (#41) from feature/dxf into develop
Reviewed-on: #41
|
3 years ago |
