Commit Graph

412 Commits (8b7b75b57bd91402fc21cc17a53ac0d53b5ed266)

Author SHA1 Message Date
dxfeng 8b7b75b57b Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 35439a442f BUG 修复 3 years ago
Chengliang fbd608a52a 顶部按钮修改 3 years ago
dxfeng 76b9cd2a89 部门复制 3 years ago
dxfeng 34d44b6c91 部门复制 3 years ago
dxfeng 8e385537da BUG修复 3 years ago
dxfeng 5c66744468 部门合并、组织导入 3 years ago
dxfeng f6c41a3467 部门合并重写 3 years ago
Chengliang 6de1b0746f 修复富文本长度 3 years ago
dxfeng 0a87a2ad4d Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 91a8ad0bd3 导入BUG 3 years ago
Chengliang c280c5f908 fixed 3 years ago
dxfeng 59f76c012c 触发器,分部、部门赋值,SQL脚本 3 years ago
dxfeng 34af4f95c9 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 79c5f94862 导入问题处理 3 years ago
dxfeng 120b4efdba 不同等级方案、编号可重复 3 years ago
Chengliang 8553e37c22 fixed 3 years ago
Chengliang 1c900eafc9 Merge remote-tracking branch 'origin/develop' into feature/cl
# Conflicts:
#	src/com/engine/organization/service/impl/CompServiceImpl.java
3 years ago
dxfeng 6765fd8fc4 左侧树排序 3 years ago
Chengliang ba0b31f086 fixed 3 years ago
dxfeng 900ded1aad 表结构更新 3 years ago
dxfeng 278d61c499 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
Chengliang 3e06077e2a fixed 3 years ago
dxfeng 6c04ffd384 编制管理 3 years ago
dxfeng 6415ee3eb7 编制方案 3 years ago
dxfeng d65551c0ee 复制BUG修复 3 years ago
dxfeng b1b2a9a88a 部门管理,更新为EC 3 years ago
dxfeng 4fa38f704c 分部管理,更新为EC 3 years ago
dxfeng f05cf6da8f BUG修复 3 years ago
reset 38a1fca585
!224 bug修复
Merge pull request !224 from reset/feature/cl
3 years ago
Chengliang 0ffb0bac33 fix 3 years ago
dxfeng 337f8e51ed Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 989526bc26 使用状态BUG修复 3 years ago
Chengliang 819a053aa3 fixed 3 years ago
Chengliang f5fcbdaff8 列表宽度顺序调整 3 years ago
reset 385ff8331e
!220 fixed
Merge pull request !220 from reset/feature/cl
3 years ago
Chengliang 3eb29f823f fixed 3 years ago
dxfeng 09d624b46b
!219 触发器、非标开关
Merge pull request !219 from dxfeng/feature/dxf
3 years ago
dxfeng 489ad2fdd0 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng b49a25742a 触发器、非标开关 3 years ago
Chengliang 80d3202c70 fixed 3 years ago
Chengliang b5b90a6403 修复组织架构图跳转问题 3 years ago
dxfeng 1f7f299368 分部、部门、岗位触发器 3 years ago
dxfeng 56ed6aa197 BUG修复 3 years ago
dxfeng 21dc07dd40 BUG修复 3 years ago
dxfeng 5dc920e364 人员信息分类 3 years ago
dxfeng cfc78875c6 人员信息分类 3 years ago
dxfeng b6caffc74f 人员信息分类 删除接口 3 years ago
dxfeng 2744f85eff BUG修复 3 years ago
dxfeng 532a6d00ce 人员信息分类 3 years ago