Commit Graph

46 Commits

Author SHA1 Message Date
dxfeng a3a0ce8046 岗位按钮、人员字段权限 2022-11-08 17:26:59 +08:00
dxfeng 3ac7c2b959 聚才林花名册 2022-10-12 15:28:11 +08:00
dxfeng 231addfda1 人事卡片接口开发 2022-10-09 11:42:26 +08:00
dxfeng b494a6a96e BUG修复 2022-09-16 11:01:31 +08:00
dxfeng 8e385537da BUG修复 2022-09-09 10:25:57 +08:00
dxfeng 2744f85eff BUG修复 2022-08-29 11:07:10 +08:00
dxfeng 0d9cbe7ff5 BUG修复 2022-08-23 17:43:09 +08:00
dxfeng 07dabf46a0 BUG修复 2022-08-22 18:56:27 +08:00
dxfeng 477a2f3bce 自定义字段BUG修复 2022-08-22 13:35:21 +08:00
dxfeng 3acec4730d BUG修复,权限控制 2022-08-17 19:29:46 +08:00
dxfeng d5447c8e59 岗位导入 2022-07-27 16:47:19 +08:00
Chengliang 0ddecb1d2f v1.2 2022-06-20 11:12:37 +08:00
dxfeng 2af1fb6336 移动到组 2022-06-20 09:09:14 +08:00
dxfeng 6df1accb98 BUG 修复 2022-06-17 16:54:16 +08:00
dxfeng f42ee2b8d1 BUG 修复 2022-06-17 16:06:29 +08:00
dxfeng 20bafffd2f BUG 修复 2022-06-17 16:00:05 +08:00
dxfeng caff3332ce BUG 修复 2022-06-17 14:19:52 +08:00
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
2022-06-17 11:51:48 +08:00
dxfeng e9aa68229d 表结构更新 2022-06-17 11:48:15 +08:00
dxfeng 445507d10d 表结构更新 2022-06-17 10:54:59 +08:00
reset bb324ad8d1
!93 新增类型修改
Merge pull request !93 from reset/feature/cl
2022-06-17 02:41:20 +00:00
Chengliang b60a335a1c 新增类型修改 2022-06-17 10:39:52 +08:00
dxfeng c8604a8e40 数据返回格式修改 2022-06-17 09:45:32 +08:00
dxfeng 9aebfbcecc 字段删除 移动分组 2022-06-16 18:26:12 +08:00
dxfeng 3ba19c1b8d 代码合并 2022-06-16 18:08:06 +08:00
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
2022-06-16 18:04:32 +08:00
Chengliang 6d4448ec51 子信息维护 2022-06-16 17:57:03 +08:00
dxfeng 4d2a70ad5d 自定义字段列表接口 2022-06-16 17:53:48 +08:00
dxfeng 08ca2e0c5d 自定义字段列表 2022-06-16 16:10:33 +08:00
dxfeng 52c964f199 添加自定义字段接口 2022-06-16 14:19:54 +08:00
dxfeng 57b29a2312 BUG修复 2022-06-16 09:55:07 +08:00
dxfeng e588fb0c96 BUG修复 2022-06-16 09:37:36 +08:00
dxfeng 70de6bbbd7 处理代码冲突 2022-06-15 18:12:53 +08:00
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
2022-06-15 18:09:26 +08:00
dxfeng 7c02e9bc61 分组删除 新增自定义字段 2022-06-15 18:03:01 +08:00
Chengliang 8564d29bf1 新增类型默认title 2022-06-15 17:56:29 +08:00
Chengliang f4f7038611 新增编辑类型 2022-06-15 17:17:34 +08:00
Chengliang 032a363985 自定义页面树 2022-06-15 11:36:48 +08:00
dxfeng b4b54fa1e1 分组维护 新建分组 2022-06-15 11:25:23 +08:00
dxfeng 568c9411da 代码合并 2022-06-14 17:57:41 +08:00
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
2022-06-14 17:56:26 +08:00
dxfeng a7e5619097 细化分组、标题、名字表是否启用;
明细表按照上下级关系展示。
2022-06-14 17:53:49 +08:00
Chengliang 6b1ce95b48 自定义设置页面树 2022-06-14 16:10:26 +08:00
dxfeng 9259596e54 自定义字段 getTabInfo 2022-06-14 15:29:22 +08:00
Chengliang fadd2577cb 修改注释 2022-06-14 11:07:48 +08:00
Chengliang 7256a94abd 自定义设置后端 2022-06-14 09:36:47 +08:00