Commit Graph

116 Commits (71d6a40fbc857c5fa74fc53666a8b746a3f848f0)

Author SHA1 Message Date
dxfeng 40a7c066a2 记录操作日志 3 years ago
dxfeng f5d95fabb2 记录操作日志 3 years ago
dxfeng 033e90aa34 操作日志 3 years ago
dxfeng 03f59d55d0 人员列表查询系统表 异常信息处理 3 years ago
dxfeng 5291c3b855 分部列表BUG修复 3 years ago
dxfeng fca0bb4dad 人员导入 3 years ago
dxfeng d508a4d9d0 人员导入,日志表结构 3 years ago
reset be94ae88e7
!129 1
Merge pull request !129 from reset/feature/cl
3 years ago
Chengliang 5445e6bfac 导出和批量导出完成 3 years ago
Chengliang 300ccd6d77 “导出修改” 3 years ago
dxfeng 48171c7e82 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
Chengliang 783b9fc6bf 人员导出 3 years ago
dxfeng 5ceb8ae068 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng ff06d705e7 人员导入 3 years ago
dxfeng 2fb33877f5 人员导入 3 years ago
Chengliang 0ad6157c26 人员导出功能 3 years ago
dxfeng d0ea50cec5 部门、岗位 合并 3 years ago
dxfeng 15131186de 分部、部门、岗位列表排序 3 years ago
dxfeng 6c40245b02 组织人事测试、优化 3 years ago
dxfeng de1d4a8944 组织人事测试、优化 3 years ago
dxfeng f035662fb6 组织人事测试、优化 3 years ago
dxfeng eeb8c47451 组织人事测试、优化 3 years ago
dxfeng f72db1b5f9 组织人事测试、优化 3 years ago
dxfeng 187be45bdf 人员管理:左侧树、列表接口 3 years ago
dxfeng b8f866e28b 人员树接口 3 years ago
dxfeng abf99aaa51 BUG修复 3 years ago
dxfeng 2af1fb6336 移动到组 3 years ago
dxfeng 6df1accb98 BUG 修复 3 years ago
dxfeng 20bafffd2f BUG 修复 3 years ago
dxfeng caff3332ce BUG 修复 3 years ago
dxfeng fdf2572654 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
 Conflicts:
	src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml
3 years ago
dxfeng e9aa68229d 表结构更新 3 years ago
dxfeng 445507d10d 表结构更新 3 years ago
Chengliang b60a335a1c 新增类型修改 3 years ago
dxfeng eb9c77b2d0 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
 Conflicts:
	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
Chengliang 6d4448ec51 子信息维护 3 years ago
dxfeng 4d2a70ad5d 自定义字段列表接口 3 years ago
dxfeng 52c964f199 添加自定义字段接口 3 years ago
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
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
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 5b0864d503 添加字段分组表 3 years ago
dxfeng 2ed79cc994 添加字段分组表 3 years ago