 dxfeng
|
50b7845f26
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
Conflicts:
src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java
|
9 months ago |
|
dxfeng
|
93d672f14c
|
禁用BUG修复
|
9 months ago |
 liang.cheng
|
f033e08f0b
|
Merge pull request '1.编制信息增加定时任务更新在编数' (#267) from feature/cl into develop
Reviewed-on: #267
|
9 months ago |
|
Chengliang
|
edfbdc9cb9
|
1.编制信息增加定时任务更新在编数
2.增加usekind筛选人员
|
9 months ago |
|
dxfeng
|
51dac61a21
|
多语言BUG修复
|
9 months ago |
|
dxfeng
|
0e53d8221d
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
9 months ago |
|
dxfeng
|
97a3c34159
|
BUG修复-花名册动态搜索条件BUG修复
|
9 months ago |
|
liang.cheng
|
869f70b241
|
Merge pull request 'feature/cl' (#266) from feature/cl into develop
Reviewed-on: #266
|
9 months ago |
|
Chengliang
|
267437f05a
|
花名册页面列定制调整
|
9 months ago |
|
Chengliang
|
1d5f2a90be
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl
|
9 months ago |
|
dxfeng
|
f41d015019
|
BUG修复-部门更新BUG修复
|
9 months ago |
|
dxfeng
|
99901f5cb9
|
BUG修复-花名册动态搜索条件BUG修复
|
9 months ago |
|
Chengliang
|
3bbe1ef027
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl
|
9 months ago |
|
dxfeng
|
f2fabe198d
|
BUG修复-花名册树不展示封存数据
|
9 months ago |
|
dxfeng
|
ec56ff8b46
|
DM数据库，岗位数据不展示BUG修复
|
9 months ago |
|
dxfeng
|
e477132c82
|
多语言BUG修复
|
9 months ago |
|
Chengliang
|
b676495a81
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl
|
9 months ago |
|
dxfeng
|
e655b65329
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
9 months ago |
|
dxfeng
|
c2f1f022c7
|
聚才林岗位，添加分部、部门字段
|
9 months ago |
|
liang.cheng
|
ab5052b3eb
|
Merge pull request '顺胜v5.0开发' (#265) from feature/cl into develop
Reviewed-on: #265
|
9 months ago |
|
Chengliang
|
28145a52dc
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl
|
9 months ago |
|
dxfeng
|
6054983dbc
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
9 months ago |
|
dxfeng
|
0b0fd72931
|
花名册显示定制模板保存BUB修复
|
9 months ago |
|
Chengliang
|
6fd0286357
|
顺胜v5.0开发
|
10 months ago |
|
dxfeng
|
b31ee6a16b
|
Merge pull request '花名册树，同级情况下，部门展示在分部前面' (#264) from feature/dxf into develop
Reviewed-on: #264
|
10 months ago |
|
dxfeng
|
6e6c66687b
|
花名册树，同级情况下，部门展示在分部前面
|
10 months ago |
|
dxfeng
|
c44a6784fd
|
Merge pull request '架构图BUG修复' (#263) from feature/dxf into develop
Reviewed-on: #263
|
10 months ago |
|
dxfeng
|
4d88d2f063
|
架构图BUG修复
|
10 months ago |
|
dxfeng
|
251a001eac
|
Merge pull request 'feature/dxf' (#262) from feature/dxf into develop
Reviewed-on: #262
|
10 months ago |
|
dxfeng
|
75b381f6d8
|
组织树，部门名称取简称
|
10 months ago |
|
dxfeng
|
37f0361d92
|
花名册树，同级情况下，部门展示在分部前面
|
10 months ago |
|
dxfeng
|
f928ea04d5
|
人员卡片，排序、去除附件字段
|
10 months ago |
|
liang.cheng
|
fcf177c194
|
Merge pull request 'feature/cl' (#261) from feature/cl into develop
Reviewed-on: #261
|
10 months ago |
|
Chengliang
|
e7dc7e91fc
|
编制信息导入
|
10 months ago |
|
Chengliang
|
2dadec37cd
|
编制信息导入
|
10 months ago |
|
Chengliang
|
eb477c7016
|
多语言完善
|
10 months ago |
|
Chengliang
|
e97862f67e
|
多语言完善
|
10 months ago |
|
Chengliang
|
d68b409a63
|
组织架构图功能完善
|
10 months ago |
|
Chengliang
|
6349b0ce04
|
组织架构图功能完善
|
10 months ago |
|
dxfeng
|
91ca23bc27
|
Merge pull request '多语言支持' (#260) from feature/dxf into develop
Reviewed-on: #260
|
10 months ago |
|
dxfeng
|
165cdfadd3
|
多语言支持
|
10 months ago |
|
dxfeng
|
5ad0c97dab
|
Merge pull request 'feature/dxf' (#259) from feature/dxf into develop
Reviewed-on: #259
|
10 months ago |
|
dxfeng
|
c6d82e66ff
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
10 months ago |
|
liang.cheng
|
92bea38ad3
|
Merge pull request 'feature/cl' (#258) from feature/cl into develop
Reviewed-on: #258
|
10 months ago |
|
dxfeng
|
04128544ec
|
多语言支持
|
10 months ago |
|
Chengliang
|
ed6edca504
|
小地球设置
|
10 months ago |
|
Chengliang
|
33b32e602c
|
多语言补充
|
10 months ago |
|
Chengliang
|
1563b76db2
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl
|
10 months ago |
|
dxfeng
|
268b7eb0e6
|
Merge pull request '多语言支持' (#257) from feature/dxf into develop
Reviewed-on: #257
|
10 months ago |
|
dxfeng
|
2c7b0fe355
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
10 months ago |
