 dxfeng
|
3ec8afe78b
|
人员卡片，明细表展示
|
2022-11-14 13:56:19 +08:00 |
|
dxfeng
|
7b5a4905dc
|
BUG修复、卡片按钮排序
|
2022-11-14 11:19:08 +08:00 |
‘ml’
|
af6d920b59
|
职务导入模板生成
|
2022-11-11 17:31:17 +08:00 |
|
dxfeng
|
4a0ddd8adc
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2022-11-11 17:24:55 +08:00 |
|
dxfeng
|
cd11f06b7f
|
卡片按钮新增、删除
|
2022-11-11 17:24:22 +08:00 |
 Chengliang
|
d236127f31
|
bug修复
|
2022-11-11 16:52:01 +08:00 |
|
dxfeng
|
16794bf98c
|
人员卡片按钮保存
|
2022-11-11 16:24:26 +08:00 |
|
dxfeng
|
854a40b7cd
|
人员卡片按钮自定义
|
2022-11-11 14:11:34 +08:00 |
|
dxfeng
|
b7217dae23
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2022-11-11 14:00:08 +08:00 |
|
dxfeng
|
d16f13405c
|
人员卡片按钮自定义
|
2022-11-11 13:59:45 +08:00 |
|
‘ml’
|
1baf55e04f
|
职级职等导入更新
|
2022-11-11 13:35:00 +08:00 |
|
‘ml’
|
9517ad15d6
|
优化职级模板字段顺序
|
2022-11-11 10:36:49 +08:00 |
|
‘ml’
|
ba2434b130
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2022-11-11 09:11:25 +08:00 |
|
‘ml’
|
0459c628ea
|
职等职级导入接口20221111
|
2022-11-11 09:11:03 +08:00 |
|
dxfeng
|
57d788d807
|
人员卡片按钮权限
|
2022-11-11 09:09:53 +08:00 |
|
Chengliang
|
8e93568aa4
|
bug修复
|
2022-11-10 14:07:50 +08:00 |
|
‘ml’
|
0da123fcef
|
Merge branch 'feature/ml' into develop
# Conflicts:
# src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
|
2022-11-10 10:58:00 +08:00 |
|
‘ml’
|
ec8be58a45
|
职等职级导入接口
|
2022-11-10 10:55:56 +08:00 |
|
Chengliang
|
eeefde07ed
|
接口
|
2022-11-10 10:29:03 +08:00 |
|
dxfeng
|
fa1434a64a
|
卡片分组权限
|
2022-11-10 10:28:14 +08:00 |
|
dxfeng
|
dcf8418edb
|
代码还原
|
2022-11-10 10:24:48 +08:00 |
|
dxfeng
|
0e41f08327
|
组织架构图搜索下拉框、集团负责人BUG修复
|
2022-11-09 18:50:39 +08:00 |
|
‘ml’
|
ddafc854b6
|
修复组织机构图虚拟组织不显示
|
2022-11-09 18:48:42 +08:00 |
|
dxfeng
|
466ba43b31
|
人员卡片类别展示权限控制
|
2022-11-09 16:58:09 +08:00 |
|
dxfeng
|
a6952f41b0
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2022-11-09 11:13:55 +08:00 |
|
dxfeng
|
b0021dae20
|
字段允许个人修改
|
2022-11-09 11:07:55 +08:00 |
|
liang.cheng
|
c2a1908c10
|
Merge pull request 'bug修复' (#44) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/44
|
2022-11-09 09:54:03 +08:00 |
|
Chengliang
|
99f849f350
|
bug修复
|
2022-11-09 09:45:19 +08:00 |
|
dxfeng
|
a3a0ce8046
|
岗位按钮、人员字段权限
|
2022-11-08 17:26:59 +08:00 |
|
dxfeng
|
3813c8b54a
|
Merge pull request '岗位按钮、组织架构图 BUG修复' (#43) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/43
|
2022-11-08 15:26:13 +08:00 |
|
dxfeng
|
9a163f1742
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2022-11-08 15:21:51 +08:00 |
|
dxfeng
|
c03a7c599a
|
岗位按钮、组织架构图 BUG修复
|
2022-11-08 15:21:29 +08:00 |
|
Chengliang
|
dc347c755d
|
人员卡片菜单权限接口
|
2022-11-08 09:23:53 +08:00 |
|
dxfeng
|
df0d688e6f
|
分权BUG修复
|
2022-11-03 16:51:56 +08:00 |
|
dxfeng
|
31645b34fe
|
分权BUG修复
|
2022-11-03 16:45:02 +08:00 |
|
dxfeng
|
ffe09c8933
|
组织架构图，不展示手机、地址、部门
|
2022-11-03 14:54:14 +08:00 |
|
dxfeng
|
9b36018c9a
|
Merge pull request '分权BUG修复' (#38) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/38
|
2022-11-03 11:12:59 +08:00 |
|
dxfeng
|
47aafefa5a
|
分权BUG修复
|
2022-11-03 11:06:36 +08:00 |
|
‘ml’
|
5e981c8163
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2022-11-02 20:19:16 +08:00 |
|
‘ml’
|
7d88bb9d5b
|
虚拟组织(新增修改删除接口)
|
2022-11-02 20:18:55 +08:00 |
|
Chengliang
|
afcbbcefb1
|
人员卡片权限接口
|
2022-11-02 17:44:52 +08:00 |
|
dxfeng
|
f6779ec20a
|
Merge pull request '组织架构图分权功能' (#34) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/34
|
2022-11-02 11:00:18 +08:00 |
|
dxfeng
|
be90013ca0
|
组织架构图分权功能
|
2022-11-02 10:55:15 +08:00 |
|
liang.cheng
|
ac5eb30534
|
Merge pull request '人员卡片权限' (#33) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/33
|
2022-11-01 17:55:07 +08:00 |
|
Chengliang
|
4e4cf54f8a
|
人员卡片权限
|
2022-11-01 17:53:31 +08:00 |
|
dxfeng
|
895528617b
|
分部、部门、岗位、人员 分权功能开发
|
2022-11-01 10:05:43 +08:00 |
|
dxfeng
|
955134dc28
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
Conflicts:
src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java
|
2022-10-31 11:40:05 +08:00 |
|
dxfeng
|
0b3cd0641b
|
分权开发
|
2022-10-28 17:43:46 +08:00 |
|
Chengliang
|
1e08772a9d
|
分权开关设置
|
2022-10-28 17:41:56 +08:00 |
|
liang.cheng
|
19cccb9345
|
Merge pull request 'feature/detach' (#29) from feature/detach into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/29
|
2022-10-28 09:36:40 +08:00 |