Commit Graph

212 Commits (a2c768d0ab2407b2ccc24aa661e9294dfd179c87)

Author SHA1 Message Date
dxfeng a2c768d0ab 组织人事测试、优化 3 years ago
dxfeng e4dc4704ce 组织人事测试、优化 3 years ago
dxfeng de1d4a8944 组织人事测试、优化 3 years ago
dxfeng f035662fb6 组织人事测试、优化 3 years ago
dxfeng eeb8c47451 组织人事测试、优化 3 years ago
dxfeng f72db1b5f9 组织人事测试、优化 3 years ago
dxfeng 779e03cb32 修改时,编号可以修改 3 years ago
dxfeng 9796bdc823 修改时,编号可以修改 3 years ago
dxfeng 0b78da90ce Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng bdc813000e 人员管理查询条件 按钮接口,
是否禁用名称更改
3 years ago
reset 9ab987c01b
!110 增加排序
Merge pull request !110 from reset/feature/cl
3 years ago
Chengliang d3bcc35f31 增加排序 3 years ago
dxfeng 5b6cf8fe72 人员管理新增、编辑相关接口 3 years ago
dxfeng 187be45bdf 人员管理:左侧树、列表接口 3 years ago
dxfeng fe0417618c Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng b8f866e28b 人员树接口 3 years ago
Chengliang 4cbc15affd 优化 3 years ago
dxfeng d4e93eded4 BUG修复 3 years ago
dxfeng 6474ce7128 BUG修复 3 years ago
dxfeng ad581a9c05 BUG修复 3 years ago
dxfeng abf99aaa51 BUG修复 3 years ago
Chengliang 0ddecb1d2f v1.2 3 years ago
Chengliang 95744654b7 优化 3 years ago
dxfeng 2af1fb6336 移动到组 3 years ago
dxfeng 2a57f20693 BUG 修复 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 84adef0520 表结构更新 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