 dxfeng
|
2af1fb6336
|
移动到组
|
3 years ago |
|
dxfeng
|
3316bcf2f4
|
!99 BUG修复
Merge pull request !99 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
2a57f20693
|
BUG 修复
|
3 years ago |
|
dxfeng
|
55d82c095a
|
!98 BUG修复
Merge pull request !98 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
6df1accb98
|
BUG 修复
|
3 years ago |
|
dxfeng
|
59aa6e5002
|
!97 BUG修复
Merge pull request !97 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
f42ee2b8d1
|
BUG 修复
|
3 years ago |
|
dxfeng
|
bdfa0c3079
|
!96 BUG修复
Merge pull request !96 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
20bafffd2f
|
BUG 修复
|
3 years ago |
|
dxfeng
|
0409e587b8
|
!95 BUG修复
Merge pull request !95 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
caff3332ce
|
BUG 修复
|
3 years ago |
|
dxfeng
|
db5fdd7606
|
!94 表结构更新
Merge pull request !94 from dxfeng/feature/dxf
|
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
|
637eb5ada7
|
!92 数据返回格式修改
Merge pull request !92 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
c8604a8e40
|
数据返回格式修改
|
3 years ago |
|
dxfeng
|
b6a030c8bf
|
!91 字段删除 移动分组
Merge pull request !91 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
9aebfbcecc
|
字段删除 移动分组
|
3 years ago |
|
dxfeng
|
124756b0b7
|
!90 自定义字段列表接口
Merge pull request !90 from dxfeng/feature/dxf
|
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 |
|
reset
|
a8faa21174
|
!89 子信息维护
Merge pull request !89 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
6d4448ec51
|
子信息维护
|
3 years ago |
|
dxfeng
|
4d2a70ad5d
|
自定义字段列表接口
|
3 years ago |
|
dxfeng
|
5fd7eb3498
|
JCL_FIELD_EXTENDGROUP 添加 show_order
|
3 years ago |
|
dxfeng
|
08ca2e0c5d
|
自定义字段列表
|
3 years ago |
|
dxfeng
|
456e2ecc59
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
52c964f199
|
添加自定义字段接口
|
3 years ago |
|
dxfeng
|
6c8a6c7f2c
|
!88 BUG修复
Merge pull request !88 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
57b29a2312
|
BUG修复
|
3 years ago |
|
dxfeng
|
82b240bce9
|
!87 BUG修复
Merge pull request !87 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
e588fb0c96
|
BUG修复
|
3 years ago |
|
dxfeng
|
d33f907052
|
!86 分组删除 新增自定义字段
Merge pull request !86 from dxfeng/feature/dxf
|
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 |
|
reset
|
a44668f342
|
!85 新增title
Merge pull request !85 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
8564d29bf1
|
新增类型默认title
|
3 years ago |
|
reset
|
67727b6eee
|
!84 新增编辑类型
Merge pull request !84 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
f4f7038611
|
新增编辑类型
|
3 years ago |
|
reset
|
a3c4fd5c21
|
!83 11
Merge pull request !83 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
068c446765
|
solve conflict
|
3 years ago |
|
Chengliang
|
032a363985
|
自定义页面树
|
3 years ago |
|
dxfeng
|
c8112bd701
|
!82 分组维护 新建分组
Merge pull request !82 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
b4b54fa1e1
|
分组维护 新建分组
|
3 years ago |
|
dxfeng
|
1c7b232172
|
!81 代码合并
Merge pull request !81 from dxfeng/feature/dxf
|
3 years ago |
