Commit Graph

556 Commits (706edd43ed5dde4a857d789051f04bdcf7e9bb80)

Author SHA1 Message Date
‘ml’ 706edd43ed 职级导入提示优化1115 3 years ago
dxfeng f1a3565fc7 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 10bb8159aa 明细表BUG修复 3 years ago
‘ml’ 0bcdbc9de8 Merge remote-tracking branch 'origin/develop' into feature/ml 3 years ago
‘ml’ 306897c5bc 职务导入模板提示修复1114 3 years ago
dxfeng 7c79718d6e 人员卡片,修改字段名 3 years ago
dxfeng 3ec8afe78b 人员卡片,明细表展示 3 years ago
dxfeng 7b5a4905dc BUG修复、卡片按钮排序 3 years ago
‘ml’ af6d920b59 职务导入模板生成 3 years ago
dxfeng 4a0ddd8adc Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng cd11f06b7f 卡片按钮新增、删除 3 years ago
liang.cheng c9b82b5f71 Merge pull request 'bug修复' (#56) from feature/cl into develop
Reviewed-on: #56
3 years ago
Chengliang d236127f31 bug修复 3 years ago
‘ml’ 091f202eac 职务导入 3 years ago
dxfeng 16794bf98c 人员卡片按钮保存 3 years ago
dxfeng 854a40b7cd 人员卡片按钮自定义 3 years ago
dxfeng b7217dae23 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng d16f13405c 人员卡片按钮自定义 3 years ago
‘ml’ 1baf55e04f 职级职等导入更新 3 years ago
‘ml’ 9517ad15d6 优化职级模板字段顺序 3 years ago
‘ml’ ba2434b130 Merge remote-tracking branch 'origin/develop' into feature/ml 3 years ago
‘ml’ 0459c628ea 职等职级导入接口20221111 3 years ago
dxfeng 57d788d807 人员卡片按钮权限 3 years ago
Chengliang 8e93568aa4 bug修复 3 years ago
‘ml’ 0da123fcef Merge branch 'feature/ml' into develop
# Conflicts:
#	src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
3 years ago
‘ml’ ec8be58a45 职等职级导入接口 3 years ago
Chengliang eeefde07ed 接口 3 years ago
dxfeng fa1434a64a 卡片分组权限 3 years ago
dxfeng dcf8418edb 代码还原 3 years ago
dxfeng 0e41f08327 组织架构图搜索下拉框、集团负责人BUG修复 3 years ago
‘ml’ ddafc854b6 修复组织机构图虚拟组织不显示 3 years ago
dxfeng 466ba43b31 人员卡片类别展示权限控制 3 years ago
dxfeng a6952f41b0 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng b0021dae20 字段允许个人修改 3 years ago
liang.cheng c2a1908c10 Merge pull request 'bug修复' (#44) from feature/cl into develop
Reviewed-on: #44
3 years ago
Chengliang 99f849f350 bug修复 3 years ago
dxfeng a3a0ce8046 岗位按钮、人员字段权限 3 years ago
dxfeng 3813c8b54a Merge pull request '岗位按钮、组织架构图 BUG修复' (#43) from feature/dxf into develop
Reviewed-on: #43
3 years ago
dxfeng 9a163f1742 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng c03a7c599a 岗位按钮、组织架构图 BUG修复 3 years ago
‘ml’ a82a41bf64 修复组织机构图虚拟组织不显示 3 years ago
liang.cheng a5295a68cf Merge pull request '人员卡片菜单权限接口' (#42) from feature/cl into develop
Reviewed-on: #42
3 years ago
Chengliang dc347c755d 人员卡片菜单权限接口 3 years ago
‘ml’ b9ff329ceb 虚拟组织(建模)删除接口优化 3 years ago
dxfeng df0d688e6f 分权BUG修复 3 years ago
dxfeng 31645b34fe 分权BUG修复 3 years ago
dxfeng ffe09c8933 组织架构图,不展示手机、地址、部门 3 years ago
dxfeng 85e39fd564 分权BUG修复 3 years ago
‘ml’ 52f9e756e6 组织透视图虚拟组织修复 3 years ago
dxfeng 9b36018c9a Merge pull request '分权BUG修复' (#38) from feature/dxf into develop
Reviewed-on: #38
3 years ago