 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 |
|
dxfeng
|
b4b54fa1e1
|
分组维护 新建分组
|
2022-06-15 11:25:23 +08:00 |
|
dxfeng
|
1c7b232172
|
!81 代码合并
Merge pull request !81 from dxfeng/feature/dxf
|
2022-06-14 10:04:22 +00:00 |
|
dxfeng
|
d809107c48
|
代码合并
|
2022-06-14 18:03:35 +08:00 |
|
reset
|
07cb72c05c
|
!80 11
Merge pull request !80 from reset/feature/cl
|
2022-06-14 10:01:35 +00:00 |
|
Chengliang
|
cde0608e02
|
自定义树页面修好
|
2022-06-14 18:00:51 +08:00 |
|
dxfeng
|
851e6d28fa
|
!79 细化分组、标题、名字表是否启用； 明细表按照上下级关系展示
Merge pull request !79 from dxfeng/feature/dxf
|
2022-06-14 09:59:26 +00: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 |
|
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
|
e9947aeb46
|
!77 添加字段分组表
Merge pull request !77 from dxfeng/feature/dxf
|
2022-06-14 06:32:41 +00:00 |
|
dxfeng
|
5b0864d503
|
添加字段分组表
|
2022-06-14 14:31:52 +08:00 |
|
dxfeng
|
61590c804d
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
2022-06-14 13:59:19 +08:00 |
|
dxfeng
|
2ed79cc994
|
添加字段分组表
|
2022-06-14 13:58:58 +08:00 |
|
reset
|
72b733f820
|
!76 1
Merge pull request !76 from reset/feature/cl
|
2022-06-14 03:38:28 +00:00 |
|
Chengliang
|
c3d5c50783
|
枚举修改
|
2022-06-14 11:37:27 +08:00 |
|
dxfeng
|
eb0c55bc9e
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
Conflicts:
src/com/engine/organization/entity/SelectOptionParam.java
|
2022-06-14 11:18:21 +08:00 |
|
dxfeng
|
bbe5a11f5d
|
BUG修复
|
2022-06-14 11:17:39 +08:00 |
|
reset
|
6200efef7f
|
!75 11
Merge pull request !75 from reset/feature/cl
|
2022-06-14 03:09:09 +00:00 |
|
Chengliang
|
fadd2577cb
|
修改注释
|
2022-06-14 11:07:48 +08:00 |
|
dxfeng
|
18b86b56eb
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
2022-06-14 09:52:53 +08:00 |
|
reset
|
a8d6f94592
|
!74 自定义设置后端
Merge pull request !74 from reset/feature/cl
|
2022-06-14 01:38:27 +00:00 |
|
Chengliang
|
7256a94abd
|
自定义设置后端
|
2022-06-14 09:36:47 +08:00 |
|
dxfeng
|
4f4af1006d
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
2022-06-14 09:04:00 +08:00 |
|
dxfeng
|
5c79263ead
|
表结构更新
|
2022-06-13 17:44:59 +08:00 |
|
dxfeng
|
88b4830364
|
!73 部门、岗位 主表、拓展表动态添加字段、动态分组
Merge pull request !73 from dxfeng/feature/dxf
|
2022-06-13 09:27:19 +00:00 |
|
dxfeng
|
0dc034c66e
|
部门、岗位 主表、拓展表动态添加字段、动态分组
|
2022-06-13 17:22:34 +08:00 |
|
dxfeng
|
3a075f4ec6
|
公司/分部 主表、拓展表动态添加字段、动态分组
|
2022-06-13 13:48:03 +08:00 |
|
dxfeng
|
49155c6893
|
公司/分部 主表、拓展表动态添加字段、动态分组
|
2022-06-10 09:18:21 +08:00 |
|
dxfeng
|
5ac8ce813a
|
!72 BUG修复
Merge pull request !72 from dxfeng/feature/dxf
|
2022-06-08 07:55:25 +00:00 |
|
dxfeng
|
2ee23d5e75
|
BUG修复
|
2022-06-08 15:54:24 +08:00 |
|
dxfeng
|
b3bfdbd7af
|
!71 BUG修复
Merge pull request !71 from dxfeng/feature/dxf
|
2022-06-08 07:53:22 +00:00 |
|
dxfeng
|
497ed928e3
|
BUG修复
|
2022-06-08 15:52:46 +08:00 |
|
dxfeng
|
14725e4990
|
BUG修复
|
2022-06-08 15:21:48 +08:00 |
|
dxfeng
|
71f03a3519
|
!70 表结构更新 BUG修复
Merge pull request !70 from dxfeng/feature/dxf
|
2022-06-08 06:22:52 +00:00 |
|
dxfeng
|
80a33a7787
|
表结构更新 BUG修复
|
2022-06-08 14:21:59 +08:00 |
|
dxfeng
|
28cbc16ef3
|
!69 BUG修复
Merge pull request !69 from dxfeng/feature/dxf
|
2022-06-08 02:38:55 +00:00 |
|
dxfeng
|
ec4e92e113
|
BUG修复
|
2022-06-08 10:38:04 +08:00 |
|
dxfeng
|
153b34205d
|
!68 编制变更
Merge pull request !68 from dxfeng/feature/dxf
|
2022-06-08 02:26:26 +00:00 |
|
dxfeng
|
9877308b84
|
编制上报 编制变更
|
2022-06-08 10:25:47 +08:00 |
|
dxfeng
|
4d9deca782
|
!67 编制上报 编制变更
Merge pull request !67 from dxfeng/feature/dxf
|
2022-06-08 01:47:36 +00:00 |
|
dxfeng
|
64cbb907e0
|
编制上报 编制变更
|
2022-06-08 09:10:47 +08:00 |
|
dxfeng
|
e7ba0daab3
|
!66 编制上报 编制变更
Merge pull request !66 from dxfeng/feature/dxf
|
2022-06-08 01:04:47 +00:00 |