Commit Graph

42 Commits (c3e73c2b443be79d0b3c6408d838298dd1726016)

Author SHA1 Message Date
dxfeng 46068ab008 编制Action 添加提示信息,BUG修复 3 years ago
dxfeng 5c66744468 部门合并、组织导入 3 years ago
dxfeng 2744f85eff BUG修复 3 years ago
dxfeng 477a2f3bce 自定义字段BUG修复 3 years ago
dxfeng ff8660a586 BUG修复 3 years ago
dxfeng 1318fc1aba BUG修复 3 years ago
dxfeng f27612db94 Oracle BUG修复 3 years ago
dxfeng ceba6b5d62 BUG修复 3 years ago
dxfeng d5447c8e59 岗位导入 3 years ago
dxfeng fc8aaf7729 部门导入、日志记录 3 years ago
dxfeng 9d304b0303 分部导入 3 years ago
dxfeng 6c40245b02 组织人事测试、优化 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
Chengliang fadd2577cb 修改注释 3 years ago
dxfeng 3a075f4ec6 公司/分部 主表、拓展表动态添加字段、动态分组 3 years ago
dxfeng 49155c6893 公司/分部 主表、拓展表动态添加字段、动态分组 3 years ago
dxfeng cb1b37e05d 部门管理模块接口 拓展表通用方法抽取 3 years ago
dxfeng 1bc660ab8d 公司/分部 新增、编辑表单 表结构更新 3 years ago