Mlin
|
90e6d7b765
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
# src/com/engine/organization/web/PersonnelResumeController.java
# src/com/engine/organization/wrapper/PersonnelResumeWrapper.java
|
2 years ago |
|
Mlin
|
a86a8dd2c8
|
人员简历模板导出
|
2 years ago |
|
Mlin
|
bc47f697d0
|
人员简历模板导出
|
2 years ago |
 dxfeng
|
dde1d0d0db
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
687b580494
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
df57b4e71f
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
c41716318d
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
702092c5a2
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
ea22378df0
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
33e9073e1c
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
b53007b7c2
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
2e39235515
|
人员简历相关接口开发
|
2 years ago |
|
Mlin
|
950da74ac8
|
人员岗位显示bug修复
|
2 years ago |
|
Mlin
|
347e3505d1
|
多个部门负责人存入版本bug修复
|
2 years ago |
|
Mlin
|
7b9a82dda9
|
多部门负责人截取显示bug修复
|
2 years ago |
|
Mlin
|
4a0949b6b1
|
多部门负责人截取显示bug修复
|
2 years ago |
|
Mlin
|
18b50a4431
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
d231bf3bd3
|
多部门负责人截取显示
|
2 years ago |
|
dxfeng
|
8c6becc29c
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
Mlin
|
fbac015a99
|
部门转移岗位重复bug修复
|
2 years ago |
|
dxfeng
|
23eae34062
|
人员导出BUG
|
2 years ago |
|
dxfeng
|
a6ed99fc60
|
部门导入BUG修复
|
2 years ago |
|
Mlin
|
33106aaaec
|
sqlserver版本存入、部门转移
|
2 years ago |
|
dxfeng
|
b7938cfb6b
|
多部门负责人BUG修复
|
2 years ago |
|
dxfeng
|
4ca7eeb93c
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
665172325e
|
职等职级BUG修复
|
2 years ago |
|
Mlin
|
6dcb5db15f
|
动态字段查询
|
2 years ago |
|
dxfeng
|
a080ebea22
|
岗位浏览按钮BUG修复
|
2 years ago |
|
dxfeng
|
30bec2120a
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
31a26dec08
|
部门合并、转移。岗位同步BUG修复
|
2 years ago |
|
Mlin
|
b8158cdcec
|
oracle版数据同步问题
|
2 years ago |
|
dxfeng
|
ebf7a1bdda
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
e7cc13ed60
|
BUG修复
|
2 years ago |
|
Mlin
|
30898d0eee
|
oracle环境存入版本bug修复、新增职等职级1220
|
2 years ago |
|
Mlin
|
0128de79ea
|
oracle环境存入版本bug修复、新增职等职级1219
|
2 years ago |
|
dxfeng
|
2b0c1d0a69
|
BUG修复
|
2 years ago |
|
dxfeng
|
d21d3148bf
|
Oracle版本BUG修复
|
2 years ago |
|
Mlin
|
5bcd3e22fc
|
oracle环境存入版本bug修复1219
|
2 years ago |
|
Mlin
|
806d18e511
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
a5cc902c10
|
oracle环境存入版本bug修复
|
2 years ago |
|
dxfeng
|
b11251701a
|
BUG修复
|
2 years ago |
|
Mlin
|
afe4813427
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
78d08ea740
|
无历史版本返回为空
|
2 years ago |
|
dxfeng
|
c86e37495d
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
b9cfe839e7
|
BUG修复
|
2 years ago |
|
Mlin
|
78dfc87f61
|
同步数据接口
|
2 years ago |
|
Mlin
|
0b89abeaac
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
981ea3ad4a
|
存为版本取消存入map表，同步接口
|
2 years ago |
|
dxfeng
|
434dbacb64
|
根据职等职级字段，补充人员信息
|
2 years ago |
|
dxfeng
|
f428dff5a0
|
根据职等职级字段，补充人员信息
|
2 years ago |
|
Mlin
|
8cda66dc8b
|
bug修复
|
2 years ago |
|
Mlin
|
241bf47710
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
184a9e375f
|
版本查询接口二版
|
2 years ago |
 liang.cheng
|
afa66c74c1
|
Merge pull request '岗位刷新功能' (#100) from feature/cl into develop
Reviewed-on: #100
|
2 years ago |
|
Mlin
|
95d53a6d8c
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
faaed265fe
|
版本查询接口初版
|
2 years ago |
|
Chengliang
|
4105600770
|
岗位刷新功能
|
2 years ago |
|
Chengliang
|
4d8948724e
|
岗位增加刷新按钮
|
2 years ago |
|
dxfeng
|
e26e780310
|
Merge pull request 'BUG修复' (#98) from feature/dxf into develop
Reviewed-on: #98
|
2 years ago |
|
dxfeng
|
1db4a85d46
|
BUG修复
|
2 years ago |
|
Mlin
|
569a3132c1
|
分部、部门、人员封存后取消架构图展示
|
2 years ago |
|
Mlin
|
3be6bf11a2
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
b3057e2f4e
|
版本查询接口
|
2 years ago |
|
Mlin
|
3462511603
|
showOrder类型小数转换
|
2 years ago |
|
dxfeng
|
550be7fb14
|
BUG修复
|
2 years ago |
|
Mlin
|
7f51135424
|
定时任务
|
2 years ago |
|
dxfeng
|
42545745fe
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
946354b32d
|
BUG修复
|
2 years ago |
|
Mlin
|
1db1949a94
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
43f00f7d9d
|
sqlserver存入版本修复、定时任务
|
2 years ago |
|
dxfeng
|
d2f6fa693a
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
4117a34928
|
BUG修复
|
2 years ago |
|
dxfeng
|
8383c08a06
|
BUG修复
|
2 years ago |
|
Mlin
|
9c80a74386
|
oracle、sqlserver查询版本语句(部门存入失败)
|
2 years ago |
|
dxfeng
|
b9d06b4246
|
分权功能版本回退，岗位BUG修复
|
2 years ago |
|
Mlin
|
5897ae1563
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
e81d8f4939
|
oracle、sqlserver查询版本语句
|
2 years ago |
|
dxfeng
|
fab4614cd5
|
分权功能重构，调用EC方法
|
2 years ago |
|
dxfeng
|
ce2c34cfdd
|
BUG修复,岗位关联关系调整
|
2 years ago |
|
dxfeng
|
32fd42db2f
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
b64f15bd83
|
BUG修复,岗位关联关系调整
|
2 years ago |
|
Mlin
|
2b549bcc4a
|
人员版本控制写入逻辑
|
2 years ago |
|
dxfeng
|
6169b007ae
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
Mlin
|
32e8eb4890
|
分部、部门版本控制写入逻辑
|
2 years ago |
|
Mlin
|
1bdc7e2fa4
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
13ae136872
|
部门版本控制写入逻辑
|
2 years ago |
|
dxfeng
|
45a24cb0be
|
BUG修复,岗位关联关系调整
|
2 years ago |
|
dxfeng
|
06c9912d21
|
BUG修复,岗位关联关系调整
|
2 years ago |
|
dxfeng
|
dee6bb25b5
|
岗位关联关系调整
|
2 years ago |
|
dxfeng
|
3470ba04cd
|
岗位关联关系调整
|
2 years ago |
|
Mlin
|
73dbaf75ac
|
分部版本控制写入逻辑
|
2 years ago |
|
dxfeng
|
b368c3ea27
|
BUG修复
|
2 years ago |
|
dxfeng
|
c1c812596d
|
BUG修复
|
2 years ago |
|
dxfeng
|
eaa1c53c9c
|
分部、部门联调。BUG修复
|
2 years ago |
|
dxfeng
|
f89ebdb965
|
分部、部门联调。BUG修复
|
2 years ago |
|
dxfeng
|
a1f2c9d1ac
|
BUG修复
|
2 years ago |
|
dxfeng
|
ea8a48099f
|
Merge pull request '人员导入逻辑重写' (#87) from feature/dxf into develop
Reviewed-on: #87
|
2 years ago |
|
dxfeng
|
668231fd61
|
人员导入逻辑重写
|
2 years ago |
|
Chengliang
|
d345a5fe66
|
版本管理
|
2 years ago |
|
dxfeng
|
de03ca3b8b
|
部门列表BUG修复
|
2 years ago |
