 dxfeng
|
fc8aaf7729
|
部门导入、日志记录
|
2022-07-27 10:48:43 +08:00 |
|
dxfeng
|
c23127acc2
|
分部导入、日志记录
|
2022-07-27 09:22:15 +08:00 |
|
dxfeng
|
b1365da225
|
分部导入
|
2022-07-26 16:33:41 +08:00 |
|
dxfeng
|
9d304b0303
|
分部导入
|
2022-07-26 09:40:13 +08:00 |
MustangDeng
|
cc318fa73c
|
Merge branch 'feature/djp' into develop
|
2022-07-21 11:57:29 +08:00 |
|
MustangDeng
|
0a1e6c6e7d
|
feature: 组织架构异步数据v1.0
|
2022-07-21 11:01:36 +08:00 |
 Chengliang
|
a1ed3e45c9
|
需求优化2
|
2022-07-13 09:20:21 +08:00 |
|
dxfeng
|
81fcd96af6
|
人员拓展卡片
|
2022-07-11 15:59:15 +08:00 |
|
670124965@qq.com
|
58f3aedf9d
|
Merge branch 'feature/djp' into develop
|
2022-07-08 11:38:16 +08:00 |
|
dxfeng
|
7103eb0c73
|
记录操作日志
|
2022-07-07 15:32:30 +08:00 |
|
dxfeng
|
40a7c066a2
|
记录操作日志
|
2022-07-07 14:19:56 +08:00 |
|
MustangDeng
|
b589056585
|
组织结构图接口
|
2022-07-07 10:14:25 +08:00 |
|
dxfeng
|
2702b175cd
|
记录操作日志
|
2022-07-06 15:43:16 +08:00 |
|
dxfeng
|
bef63439b2
|
记录操作日志
|
2022-07-05 18:46:43 +08:00 |
|
dxfeng
|
278194a4a3
|
记录操作日志,岗位优化
|
2022-07-05 18:44:45 +08:00 |
|
dxfeng
|
f5d95fabb2
|
记录操作日志
|
2022-07-05 15:15:00 +08:00 |
|
dxfeng
|
37142c3a3e
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
Conflicts:
src/com/engine/organization/service/impl/DemoServiceImpl.java
|
2022-07-05 09:39:51 +08:00 |
|
dxfeng
|
033e90aa34
|
操作日志
|
2022-07-05 09:39:00 +08:00 |
|
Chengliang
|
46aeddea39
|
需求调整
|
2022-07-04 17:51:31 +08:00 |
|
reset
|
be94ae88e7
|
!129 1
Merge pull request !129 from reset/feature/cl
|
2022-06-29 08:59:32 +00:00 |
|
Chengliang
|
300ccd6d77
|
“导出修改”
|
2022-06-29 15:21:36 +08:00 |
|
dxfeng
|
9b54954ef8
|
人员导入
|
2022-06-29 14:50:11 +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 |
|
Chengliang
|
0ad6157c26
|
人员导出功能
|
2022-06-28 19:04:14 +08:00 |
|
dxfeng
|
4eef6f62de
|
人员导入
|
2022-06-28 10:47:11 +08:00 |
|
dxfeng
|
d0ea50cec5
|
部门、岗位 合并
|
2022-06-24 18:26:15 +08:00 |
|
dxfeng
|
db4e066294
|
复制分部 表结构更新
|
2022-06-24 16:14:13 +08:00 |
|
dxfeng
|
2ea923f9c9
|
转移分部
|
2022-06-24 14:22:10 +08:00 |
|
dxfeng
|
6c40245b02
|
组织人事测试、优化
|
2022-06-23 16:55:26 +08:00 |
|
dxfeng
|
f72db1b5f9
|
组织人事测试、优化
|
2022-06-22 11:22:51 +08:00 |
|
dxfeng
|
bdc813000e
|
人员管理查询条件 按钮接口，
是否禁用名称更改
|
2022-06-21 17:50:56 +08:00 |
|
dxfeng
|
5b6cf8fe72
|
人员管理新增、编辑相关接口
|
2022-06-21 16:47:39 +08:00 |
|
dxfeng
|
187be45bdf
|
人员管理：左侧树、列表接口
|
2022-06-21 13:49: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
|
445507d10d
|
表结构更新
|
2022-06-17 10:54:59 +08:00 |
|
dxfeng
|
c8604a8e40
|
数据返回格式修改
|
2022-06-17 09:45:32 +08:00 |
|
dxfeng
|
9aebfbcecc
|
字段删除 移动分组
|
2022-06-16 18:26:12 +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
|
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
|
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 |
|
Chengliang
|
032a363985
|
自定义页面树
|
2022-06-15 11:36:48 +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 |
|
Chengliang
|
6b1ce95b48
|
自定义设置页面树
|
2022-06-14 16:10:26 +08:00 |