 dxfeng
|
ae2e5bb5a4
|
人员Mapper整合
|
2022-11-21 10:58:12 +08:00 |
|
dxfeng
|
e45ff3daa3
|
导入BUG，提示信息优化
|
2022-11-17 17:02:45 +08:00 |
|
dxfeng
|
25d3db4d81
|
导入BUG，提示信息优化
|
2022-11-17 15:36:26 +08:00 |
|
dxfeng
|
a273008715
|
导入BUG，提示信息优化
|
2022-11-17 11:36:52 +08:00 |
|
dxfeng
|
0404c4b7fd
|
导入自动编号
|
2022-11-17 09:05:00 +08:00 |
|
dxfeng
|
47c09cac9a
|
导入自动编号
|
2022-11-16 17:54:57 +08:00 |
|
dxfeng
|
81943df058
|
编制、分部树排序
|
2022-11-16 17:39:58 +08:00 |
|
dxfeng
|
9b20c6838a
|
人事卡片按钮权限BUG
|
2022-11-16 16:09:32 +08:00 |
|
dxfeng
|
f9f5bc432c
|
BUG修复
|
2022-11-16 15:23:56 +08:00 |
|
dxfeng
|
67fd2df4f9
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2022-11-16 14:58:48 +08:00 |
|
dxfeng
|
05364f9265
|
BUG修复
|
2022-11-16 13:39:56 +08:00 |
‘ml’
|
caa9604315
|
职级导入异常处理方案1116
|
2022-11-16 11:22:28 +08:00 |
|
dxfeng
|
bb071c3ad9
|
Merge pull request '花名册树、角色展示、组织透视下拉框' (#64) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/64
|
2022-11-15 14:35:16 +08:00 |
|
dxfeng
|
2d64a5015b
|
组织透视下拉框BUG
|
2022-11-15 14:34:16 +08:00 |
|
‘ml’
|
706edd43ed
|
职级导入提示优化1115
|
2022-11-15 14:24:06 +08:00 |
|
dxfeng
|
f1a3565fc7
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2022-11-15 08:56:58 +08:00 |
|
dxfeng
|
10bb8159aa
|
明细表BUG修复
|
2022-11-14 19:13:35 +08:00 |
|
‘ml’
|
0bcdbc9de8
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2022-11-14 17:30:06 +08:00 |
|
‘ml’
|
306897c5bc
|
职务导入模板提示修复1114
|
2022-11-14 17:29:55 +08:00 |
|
dxfeng
|
7c79718d6e
|
人员卡片，修改字段名
|
2022-11-14 14:05:48 +08:00 |
|
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 |