 dxfeng
|
17f4789e33
|
BUG修复
|
2022-11-16 14:59:22 +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 |
 liang.cheng
|
b3bfad0148
|
Merge pull request '“栏目表格修复”' (#65) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/65
|
2022-11-16 14:08:40 +08:00 |
|
Chengliang
|
cb4db723e4
|
“栏目表格修复”
|
2022-11-16 14:06:12 +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
|
4fc2eca27b
|
花名册树、角色展示BUG
|
2022-11-15 11:47:54 +08:00 |
|
dxfeng
|
f8497aa3e6
|
Merge pull request '明细表BUG修复' (#63) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/63
|
2022-11-15 08:59:43 +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
|
631b77826d
|
Merge pull request '人员卡片，修改字段名' (#62) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/62
|
2022-11-14 14:06:26 +08:00 |
|
dxfeng
|
7c79718d6e
|
人员卡片，修改字段名
|
2022-11-14 14:05:48 +08:00 |
|
dxfeng
|
0884a88c8c
|
Merge pull request '人员卡片，明细表展示' (#61) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/61
|
2022-11-14 13:58:25 +08:00 |
|
dxfeng
|
e84c3af2ac
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2022-11-14 13:56:39 +08:00 |
|
dxfeng
|
3ec8afe78b
|
人员卡片，明细表展示
|
2022-11-14 13:56:19 +08:00 |
|
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 |