12 Commits (e588fb0c96802827f4bb36d8db55a0c6d869f9ab)

Author	SHA1	Message	Date
dxfeng	e588fb0c96	BUG修复	3 years ago
dxfeng	3f151d55e6	Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf ... Conflicts: src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java src/com/engine/organization/service/FieldDefinedService.java src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java src/com/engine/organization/web/FieldDefinedController.java src/com/engine/organization/wrapper/FieldDefinedWrapper.java	3 years ago
dxfeng	7c02e9bc61	分组删除 新增自定义字段	3 years ago
Chengliang	f4f7038611	新增编辑类型	3 years ago
Chengliang	068c446765	solve conflict	3 years ago
Chengliang	032a363985	自定义页面树	3 years ago
dxfeng	b4b54fa1e1	分组维护 新建分组	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
Chengliang	6b1ce95b48	自定义设置页面树	3 years ago
dxfeng	9259596e54	自定义字段 getTabInfo	3 years ago
Chengliang	fadd2577cb	修改注释	3 years ago
Chengliang	7256a94abd	自定义设置后端	3 years ago