Commit Graph

1530 Commits (d802a3b200eed89d0f7e1821f9285ba3d725f5b8)
 

Author SHA1 Message Date
dxfeng b4b54fa1e1 分组维护 新建分组 3 years ago
dxfeng 1c7b232172
!81 代码合并
Merge pull request !81 from dxfeng/feature/dxf
3 years ago
dxfeng d809107c48 代码合并 3 years ago
reset 07cb72c05c
!80 11
Merge pull request !80 from reset/feature/cl
3 years ago
Chengliang cde0608e02 自定义树页面修好 3 years ago
dxfeng 851e6d28fa
!79 细化分组、标题、名字表是否启用; 明细表按照上下级关系展示
Merge pull request !79 from dxfeng/feature/dxf
3 years ago
dxfeng 568c9411da 代码合并 3 years ago
dxfeng 079addd6c7 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
 Conflicts:
	src/com/engine/organization/service/FieldDefinedService.java
	src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
3 years ago
dxfeng a7e5619097 细化分组、标题、名字表是否启用;
明细表按照上下级关系展示。
3 years ago
reset 6e7c76ac0d
!78 自定义设置页面树
Merge pull request !78 from reset/feature/cl
3 years ago
Chengliang 6b1ce95b48 自定义设置页面树 3 years ago
dxfeng 9259596e54 自定义字段 getTabInfo 3 years ago
dxfeng e9947aeb46
!77 添加字段分组表
Merge pull request !77 from dxfeng/feature/dxf
3 years ago
dxfeng 5b0864d503 添加字段分组表 3 years ago
dxfeng 61590c804d Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 2ed79cc994 添加字段分组表 3 years ago
reset 72b733f820
!76 1
Merge pull request !76 from reset/feature/cl
3 years ago
Chengliang c3d5c50783 枚举修改 3 years ago
dxfeng eb0c55bc9e Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
 Conflicts:
	src/com/engine/organization/entity/SelectOptionParam.java
3 years ago
dxfeng bbe5a11f5d BUG修复 3 years ago
reset 6200efef7f
!75 11
Merge pull request !75 from reset/feature/cl
3 years ago
Chengliang fadd2577cb 修改注释 3 years ago
dxfeng 18b86b56eb Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
reset a8d6f94592
!74 自定义设置后端
Merge pull request !74 from reset/feature/cl
3 years ago
Chengliang 7256a94abd 自定义设置后端 3 years ago
dxfeng 4f4af1006d Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 5c79263ead 表结构更新 3 years ago
dxfeng 88b4830364
!73 部门、岗位 主表、拓展表动态添加字段、动态分组
Merge pull request !73 from dxfeng/feature/dxf
3 years ago
dxfeng 0dc034c66e 部门、岗位 主表、拓展表动态添加字段、动态分组 3 years ago
dxfeng 3a075f4ec6 公司/分部 主表、拓展表动态添加字段、动态分组 3 years ago
dxfeng 49155c6893 公司/分部 主表、拓展表动态添加字段、动态分组 3 years ago
dxfeng 5ac8ce813a
!72 BUG修复
Merge pull request !72 from dxfeng/feature/dxf
3 years ago
dxfeng 2ee23d5e75 BUG修复 3 years ago
dxfeng b3bfdbd7af
!71 BUG修复
Merge pull request !71 from dxfeng/feature/dxf
3 years ago
dxfeng 497ed928e3 BUG修复 3 years ago
dxfeng 14725e4990 BUG修复 3 years ago
dxfeng 71f03a3519
!70 表结构更新 BUG修复
Merge pull request !70 from dxfeng/feature/dxf
3 years ago
dxfeng 80a33a7787 表结构更新 BUG修复 3 years ago
dxfeng 28cbc16ef3
!69 BUG修复
Merge pull request !69 from dxfeng/feature/dxf
3 years ago
dxfeng ec4e92e113 BUG修复 3 years ago
dxfeng 153b34205d
!68 编制变更
Merge pull request !68 from dxfeng/feature/dxf
3 years ago
dxfeng 9877308b84 编制上报 编制变更 3 years ago
dxfeng 4d9deca782
!67 编制上报 编制变更
Merge pull request !67 from dxfeng/feature/dxf
3 years ago
dxfeng 64cbb907e0 编制上报 编制变更 3 years ago
dxfeng e7ba0daab3
!66 编制上报 编制变更
Merge pull request !66 from dxfeng/feature/dxf
3 years ago
dxfeng 3feac93ed0 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 77d27801b4 编制上报 编制变更 3 years ago
dxfeng 184580bb39 权限管理 BUG修复 3 years ago
dxfeng c452aa47cb
!65 权限管理 BUG修复
Merge pull request !65 from dxfeng/feature/dxf
3 years ago
dxfeng c0332d51ba 权限管理 BUG修复 3 years ago