 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
|
779e03cb32
|
修改时，编号可以修改
|
2022-06-21 18:39:26 +08:00 |
|
dxfeng
|
9796bdc823
|
修改时，编号可以修改
|
2022-06-21 18:23:17 +08:00 |
|
dxfeng
|
0b78da90ce
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
2022-06-21 17:51:17 +08:00 |
|
dxfeng
|
bdc813000e
|
人员管理查询条件 按钮接口，
是否禁用名称更改
|
2022-06-21 17:50:56 +08:00 |
 reset
|
9ab987c01b
|
!110 增加排序
Merge pull request !110 from reset/feature/cl
|
2022-06-21 09:16:17 +00:00 |
|
Chengliang
|
d3bcc35f31
|
增加排序
|
2022-06-21 17:12:33 +08:00 |
|
dxfeng
|
5b6cf8fe72
|
人员管理新增、编辑相关接口
|
2022-06-21 16:47:39 +08:00 |
|
dxfeng
|
187be45bdf
|
人员管理：左侧树、列表接口
|
2022-06-21 13:49:37 +08:00 |
|
dxfeng
|
fe0417618c
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
2022-06-20 18:31:35 +08:00 |
|
dxfeng
|
b8f866e28b
|
人员树接口
|
2022-06-20 18:31:11 +08:00 |
|
Chengliang
|
4cbc15affd
|
优化
|
2022-06-20 18:26:02 +08:00 |
|
dxfeng
|
d4e93eded4
|
BUG修复
|
2022-06-20 15:43:02 +08:00 |
|
dxfeng
|
6474ce7128
|
BUG修复
|
2022-06-20 15:16:25 +08:00 |
|
dxfeng
|
ad581a9c05
|
BUG修复
|
2022-06-20 15:08:18 +08:00 |
|
dxfeng
|
abf99aaa51
|
BUG修复
|
2022-06-20 14:50:59 +08:00 |
|
Chengliang
|
0ddecb1d2f
|
v1.2
|
2022-06-20 11:12:37 +08:00 |
|
Chengliang
|
95744654b7
|
优化
|
2022-06-20 09:48:17 +08:00 |
|
dxfeng
|
2af1fb6336
|
移动到组
|
2022-06-20 09:09:14 +08:00 |
|
dxfeng
|
2a57f20693
|
BUG 修复
|
2022-06-17 17:51:26 +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
|
84adef0520
|
表结构更新
|
2022-06-17 11:48:32 +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
|
068c446765
|
solve conflict
|
2022-06-15 11:41:44 +08:00 |
|
Chengliang
|
032a363985
|
自定义页面树
|
2022-06-15 11:36:48 +08:00 |
|
dxfeng
|
c8112bd701
|
!82 分组维护 新建分组
Merge pull request !82 from dxfeng/feature/dxf
|
2022-06-15 03:26:31 +00:00 |