Commit Graph

39 Commits (07dabf46a0d633f87a0e3c81b534f40a9a5c4860)

Author SHA1 Message Date
dxfeng 07dabf46a0 BUG修复 3 years ago
dxfeng 477a2f3bce 自定义字段BUG修复 3 years ago
dxfeng 3acec4730d BUG修复,权限控制 3 years ago
dxfeng d5447c8e59 岗位导入 3 years ago
Chengliang 0ddecb1d2f v1.2 3 years ago
dxfeng 2af1fb6336 移动到组 3 years ago
dxfeng 6df1accb98 BUG 修复 3 years ago
dxfeng f42ee2b8d1 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
reset bb324ad8d1
!93 新增类型修改
Merge pull request !93 from reset/feature/cl
3 years ago
Chengliang b60a335a1c 新增类型修改 3 years ago
dxfeng c8604a8e40 数据返回格式修改 3 years ago
dxfeng 9aebfbcecc 字段删除 移动分组 3 years ago
dxfeng 3ba19c1b8d 代码合并 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 08ca2e0c5d 自定义字段列表 3 years ago
dxfeng 52c964f199 添加自定义字段接口 3 years ago
dxfeng 57b29a2312 BUG修复 3 years ago
dxfeng e588fb0c96 BUG修复 3 years ago
dxfeng 70de6bbbd7 处理代码冲突 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 8564d29bf1 新增类型默认title 3 years ago
Chengliang f4f7038611 新增编辑类型 3 years ago
Chengliang 032a363985 自定义页面树 3 years ago
dxfeng b4b54fa1e1 分组维护 新建分组 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
Chengliang 6b1ce95b48 自定义设置页面树 3 years ago
dxfeng 9259596e54 自定义字段 getTabInfo 3 years ago
Chengliang fadd2577cb 修改注释 3 years ago
Chengliang 7256a94abd 自定义设置后端 3 years ago