 dxfeng
|
f5d95fabb2
|
记录操作日志
|
2022-07-05 15:15:00 +08:00 |
|
dxfeng
|
033e90aa34
|
操作日志
|
2022-07-05 09:39:00 +08:00 |
|
dxfeng
|
03f59d55d0
|
人员列表查询系统表 异常信息处理
|
2022-07-04 09:18:56 +08:00 |
|
dxfeng
|
5291c3b855
|
分部列表BUG修复
|
2022-07-01 17:46:25 +08:00 |
|
dxfeng
|
fca0bb4dad
|
人员导入
|
2022-07-01 14:02:03 +08:00 |
|
dxfeng
|
d508a4d9d0
|
人员导入，日志表结构
|
2022-06-30 16:22:57 +08:00 |
 reset
|
be94ae88e7
|
!129 1
Merge pull request !129 from reset/feature/cl
|
2022-06-29 08:59:32 +00:00 |
|
Chengliang
|
5445e6bfac
|
导出和批量导出完成
|
2022-06-29 16:57:45 +08:00 |
|
Chengliang
|
300ccd6d77
|
“导出修改”
|
2022-06-29 15:21:36 +08:00 |
|
dxfeng
|
48171c7e82
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
2022-06-29 14:21:17 +08:00 |
|
Chengliang
|
783b9fc6bf
|
人员导出
|
2022-06-29 14:18:47 +08:00 |
|
dxfeng
|
5ceb8ae068
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
2022-06-29 14:16:39 +08:00 |
|
dxfeng
|
ff06d705e7
|
人员导入
|
2022-06-29 14:11:16 +08:00 |
|
dxfeng
|
2fb33877f5
|
人员导入
|
2022-06-29 09:11:45 +08:00 |
|
Chengliang
|
0ad6157c26
|
人员导出功能
|
2022-06-28 19:04:14 +08:00 |
|
dxfeng
|
d0ea50cec5
|
部门、岗位 合并
|
2022-06-24 18:26:15 +08:00 |
|
dxfeng
|
15131186de
|
分部、部门、岗位列表排序
|
2022-06-23 18:49:47 +08:00 |
|
dxfeng
|
6c40245b02
|
组织人事测试、优化
|
2022-06-23 16:55:26 +08:00 |
|
dxfeng
|
de1d4a8944
|
组织人事测试、优化
|
2022-06-23 14:29:56 +08:00 |
|
dxfeng
|
f035662fb6
|
组织人事测试、优化
|
2022-06-23 13:43:52 +08:00 |
|
dxfeng
|
eeb8c47451
|
组织人事测试、优化
|
2022-06-23 09:14:19 +08:00 |
|
dxfeng
|
f72db1b5f9
|
组织人事测试、优化
|
2022-06-22 11:22:51 +08:00 |
|
dxfeng
|
187be45bdf
|
人员管理：左侧树、列表接口
|
2022-06-21 13:49:37 +08:00 |
|
dxfeng
|
b8f866e28b
|
人员树接口
|
2022-06-20 18:31:11 +08:00 |
|
dxfeng
|
abf99aaa51
|
BUG修复
|
2022-06-20 14:50:59 +08:00 |
|
dxfeng
|
2af1fb6336
|
移动到组
|
2022-06-20 09:09:14 +08:00 |
|
dxfeng
|
6df1accb98
|
BUG 修复
|
2022-06-17 16:54:16 +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 |
|
Chengliang
|
b60a335a1c
|
新增类型修改
|
2022-06-17 10:39:52 +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
|
52c964f199
|
添加自定义字段接口
|
2022-06-16 14:19:54 +08:00 |
|
dxfeng
|
e588fb0c96
|
BUG修复
|
2022-06-16 09:37:36 +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
|
f4f7038611
|
新增编辑类型
|
2022-06-15 17:17:34 +08:00 |
|
dxfeng
|
b4b54fa1e1
|
分组维护 新建分组
|
2022-06-15 11:25:23 +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 |
|
reset
|
6e7c76ac0d
|
!78 自定义设置页面树
Merge pull request !78 from reset/feature/cl
|
2022-06-14 08:11:40 +00:00 |
|
Chengliang
|
6b1ce95b48
|
自定义设置页面树
|
2022-06-14 16:10:26 +08:00 |
|
dxfeng
|
9259596e54
|
自定义字段 getTabInfo
|
2022-06-14 15:29:22 +08:00 |
|
dxfeng
|
5b0864d503
|
添加字段分组表
|
2022-06-14 14:31:52 +08:00 |
|
dxfeng
|
2ed79cc994
|
添加字段分组表
|
2022-06-14 13:58:58 +08:00 |
|
Chengliang
|
fadd2577cb
|
修改注释
|
2022-06-14 11:07:48 +08:00 |