 dxfeng
|
2f1b1f9f2e
|
Merge pull request 'BUG修复、卡片按钮排序' (#60) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/60
|
2022-11-14 11:21:03 +08:00 |
|
dxfeng
|
7b5a4905dc
|
BUG修复、卡片按钮排序
|
2022-11-14 11:19:08 +08:00 |
‘ml’
|
af6d920b59
|
职务导入模板生成
|
2022-11-11 17:31:17 +08:00 |
|
dxfeng
|
8c7b75e471
|
Merge pull request '卡片按钮编辑、删除' (#59) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/59
|
2022-11-11 17:25:46 +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 |
 liang.cheng
|
c9b82b5f71
|
Merge pull request 'bug修复' (#56) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/56
|
2022-11-11 16:55:29 +08:00 |
|
Chengliang
|
d236127f31
|
bug修复
|
2022-11-11 16:52:01 +08:00 |
|
‘ml’
|
091f202eac
|
职务导入
|
2022-11-11 16:50:35 +08:00 |
|
dxfeng
|
16794bf98c
|
人员卡片按钮保存
|
2022-11-11 16:24:26 +08:00 |
|
liang.cheng
|
4e915f272b
|
Merge pull request 'sql' (#55) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/55
|
2022-11-11 15:28:37 +08:00 |
|
Chengliang
|
2bf63c689e
|
sql
|
2022-11-11 15:22:41 +08:00 |
|
dxfeng
|
7c5d6bfa19
|
Merge pull request '人员卡片按钮自定义' (#54) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/54
|
2022-11-11 14:12:52 +08:00 |
|
dxfeng
|
854a40b7cd
|
人员卡片按钮自定义
|
2022-11-11 14:11:34 +08:00 |
|
dxfeng
|
afc54c6d1e
|
Merge pull request '人员卡片按钮自定义' (#53) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/53
|
2022-11-11 14:01:41 +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’
|
33fe824cae
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2022-11-11 10:37:10 +08:00 |
|
‘ml’
|
9517ad15d6
|
优化职级模板字段顺序
|
2022-11-11 10:36:49 +08:00 |
|
liang.cheng
|
003dd59cea
|
Merge pull request 'sql增加' (#52) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/52
|
2022-11-11 09:17:38 +08:00 |
|
Chengliang
|
94c1102c91
|
sql增加
|
2022-11-11 09:14:30 +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
|
76081c3213
|
Merge pull request '人员卡片按钮权限' (#51) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/51
|
2022-11-11 09:10:54 +08:00 |
|
dxfeng
|
57d788d807
|
人员卡片按钮权限
|
2022-11-11 09:09:53 +08:00 |
|
liang.cheng
|
f2ea296832
|
Merge pull request 'bug修复' (#50) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/50
|
2022-11-10 14:16:42 +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 |
|
liang.cheng
|
8f7e9889a8
|
Merge pull request '接口' (#49) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/49
|
2022-11-10 10:31:23 +08:00 |
|
Chengliang
|
eeefde07ed
|
接口
|
2022-11-10 10:29:03 +08:00 |
|
dxfeng
|
13345f7c50
|
Merge pull request '卡片分组权限' (#48) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/48
|
2022-11-10 10:28:45 +08:00 |
|
dxfeng
|
fa1434a64a
|
卡片分组权限
|
2022-11-10 10:28:14 +08:00 |
|
dxfeng
|
f1be7ad454
|
Merge pull request '代码还原' (#47) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/47
|
2022-11-10 10:25:57 +08:00 |
|
dxfeng
|
dcf8418edb
|
代码还原
|
2022-11-10 10:24:48 +08:00 |
|
dxfeng
|
8a5ce6ed96
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2022-11-10 09:55:21 +08:00 |
|
dxfeng
|
0e41f08327
|
组织架构图搜索下拉框、集团负责人BUG修复
|
2022-11-09 18:50:39 +08:00 |
|
‘ml’
|
ddafc854b6
|
修复组织机构图虚拟组织不显示
|
2022-11-09 18:48:42 +08:00 |
|
dxfeng
|
2b317e3d67
|
Merge pull request '岗位按钮 人员字段权限 人员卡片权限' (#45) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/45
|
2022-11-09 17:01:10 +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
|
22fa6a60c7
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2022-11-08 16:42:47 +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 |