develop #294

Merged
liang.cheng merged 13 commits from develop into master 3 months ago

13 Commits (master)

Author SHA1 Message Date
liang.cheng a159f3d8b2 Merge pull request 'feature/cl' (#293) from feature/cl into develop
Reviewed-on: #293
3 months ago
liang.cheng 4308cba888 Merge pull request '部门简称及花名册树问题修复' (#292) from 山西国药控股有限公司 into feature/cl
Reviewed-on: #292
3 months ago
Chengliang 418a302fcb 部门简称及花名册树问题修复 3 months ago
Chengliang d2750025a5 部门简称及花名册树问题修复 3 months ago
liang.cheng df6e7a9df7 Merge pull request 'feature/cl' (#291) from feature/cl into develop
Reviewed-on: #291
3 months ago
Chengliang 2fe6013af1 组织架构图多语言 key值问题处理 3 months ago
Chengliang 722e1b8fe6 聚才林岗位外部搜索样式 岗位(分部) 3 months ago
Chengliang 4d4827a2c4 移除企通学配置文件 标准配置文件增加enable 3 months ago
Chengliang b9c00d1e66 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 3 months ago
liang.cheng 6a5e6e5bec Merge pull request 'feature/cl' (#289) from feature/cl into develop
Reviewed-on: #289
4 months ago
Chengliang 80248b03d6 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 4 months ago
liang.cheng d77e9d35d4 Merge pull request 'feature/cl' (#288) from feature/cl into develop
Reviewed-on: #288
5 months ago
liang.cheng 421a70491a Merge pull request 'feature/cl' (#287) from feature/cl into develop
Reviewed-on: #287
6 months ago