 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 |