 liang.cheng
|
63df0e596f
|
Merge pull request 'feature/cl' (#275) from feature/cl into develop
Reviewed-on: #275
|
10 months ago |
|
Chengliang
|
53afce795a
|
组织编制信息导入bug修复
|
10 months ago |
|
Chengliang
|
1705857817
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl
|
10 months ago |
|
Chengliang
|
2114368acc
|
组织编制信息导入bug修复
|
10 months ago |
|
liang.cheng
|
50c7a9373e
|
Merge pull request 'feature/cl' (#274) from feature/cl into develop
Reviewed-on: #274
|
10 months ago |
|
Chengliang
|
2ea741211f
|
组织非标去除浏览按钮展示虚拟组织
|
10 months ago |
|
Chengliang
|
816601407c
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl
|
10 months ago |
 dxfeng
|
d865bb976b
|
组织架构图，根结点为部门时，层级问题处理
|
10 months ago |
|
Chengliang
|
94994972e3
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl
|
10 months ago |
|
dxfeng
|
4dd6a99c1d
|
Merge branch 'feature/dxf' into develop
|
10 months ago |
|
dxfeng
|
fe60767829
|
组织架构图，根结点为部门时，层级问题处理
|
10 months ago |
|
dxfeng
|
5c05759ad4
|
组织架构图，根结点为部门时，层级问题处理
|
10 months ago |
|
Chengliang
|
868a973bc5
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl
|
10 months ago |
|
dxfeng
|
6ccb4ec3d3
|
Merge branch 'feature/dxf' into develop
|
10 months ago |
|
dxfeng
|
be807d032b
|
编制方案、编制信息分权
|
10 months ago |
|
dxfeng
|
ad9e80e1e8
|
根结点树，增加部门节点数据
|
10 months ago |
|
Chengliang
|
64ab363237
|
组织架构图增加定时任务存储和删除功能
|
10 months ago |
|
liang.cheng
|
58b57c81b7
|
Merge pull request '组织架构图增加定时任务存储和删除功能' (#273) from feature/cl into develop
Reviewed-on: #273
|
10 months ago |
|
Chengliang
|
06a3d5b225
|
组织架构图增加定时任务存储和删除功能
|
10 months ago |
|
dxfeng
|
fc79e336c0
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into develop
|
10 months ago |
|
dxfeng
|
51d34bd496
|
Merge branch 'feature/dxf' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
10 months ago |
|
dxfeng
|
d3f87a3a07
|
根结点树，增加部门节点数据
|
10 months ago |
|
dxfeng
|
a6b10dcd8e
|
根结点树，增加部门节点数据
|
10 months ago |
|
liang.cheng
|
d76c85cc19
|
Merge pull request 'feature/cl' (#272) from feature/cl into develop
Reviewed-on: #272
|
11 months ago |
|
Chengliang
|
a7ee4e47a3
|
花名册整体修复
|
11 months ago |
|
dxfeng
|
6af0092549
|
导出列根据模板生成
|
11 months ago |
|
Chengliang
|
555e3dd604
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl
|
11 months ago |
|
Chengliang
|
710d6f5000
|
花名册修复
|
11 months ago |
|
dxfeng
|
af6b076584
|
高级搜索 当前使用模板
|
11 months ago |
|
Chengliang
|
07b3bd5ae7
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl
|
11 months ago |
|
Chengliang
|
15726f1824
|
高级搜索字段展示去除未启用字段
|
11 months ago |
|
dxfeng
|
b58378854b
|
列定制 全局模板
|
11 months ago |
|
liang.cheng
|
c33532c241
|
Merge pull request 'feature/cl' (#271) from feature/cl into develop
Reviewed-on: #271
|
11 months ago |
|
Chengliang
|
ec84cd6ccf
|
测试
|
11 months ago |
|
Chengliang
|
5a230ea962
|
模板一键应用所有人
|
11 months ago |
|
liang.cheng
|
3bab245708
|
Merge pull request '统一消息返回原方法保留' (#270) from feature/cl into develop
Reviewed-on: #270
|
11 months ago |
|
Chengliang
|
7bc3a97bbb
|
统一消息返回原方法保留
|
11 months ago |
|
dxfeng
|
803331d46f
|
Merge pull request 'feature/dxf' (#269) from feature/dxf into develop
Reviewed-on: #269
|
11 months ago |
|
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
|
11 months ago |
|
dxfeng
|
93d672f14c
|
禁用BUG修复
|
11 months ago |
|
liang.cheng
|
f033e08f0b
|
Merge pull request '1.编制信息增加定时任务更新在编数' (#267) from feature/cl into develop
Reviewed-on: #267
|
11 months ago |
|
Chengliang
|
edfbdc9cb9
|
1.编制信息增加定时任务更新在编数
2.增加usekind筛选人员
|
11 months ago |
|
dxfeng
|
51dac61a21
|
多语言BUG修复
|
11 months ago |
|
dxfeng
|
0e53d8221d
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
11 months ago |
|
dxfeng
|
97a3c34159
|
BUG修复-花名册动态搜索条件BUG修复
|
11 months ago |
|
liang.cheng
|
869f70b241
|
Merge pull request 'feature/cl' (#266) from feature/cl into develop
Reviewed-on: #266
|
11 months ago |
|
Chengliang
|
267437f05a
|
花名册页面列定制调整
|
11 months ago |
|
Chengliang
|
1d5f2a90be
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl
|
11 months ago |
|
dxfeng
|
f41d015019
|
BUG修复-部门更新BUG修复
|
11 months ago |
|
dxfeng
|
99901f5cb9
|
BUG修复-花名册动态搜索条件BUG修复
|
11 months ago |
