Mlin
|
4cbb658019
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/impl/ChartServiceImpl.java
# src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
|
2 years ago |
 dxfeng
|
886717334b
|
编制方案新增，兼容PG
|
2 years ago |
|
dxfeng
|
8b617f8423
|
编制方案新增，兼容Oracle
|
2 years ago |
 liang.cheng
|
c98a38c8a8
|
Merge pull request '编制模块' (#215) from feature/cl into develop
Reviewed-on: #215
|
2 years ago |
|
Chengliang
|
b7d7912fff
|
编制模块
|
2 years ago |
|
liang.cheng
|
9ac1ca9852
|
Merge pull request '测试' (#214) from feature/cl into develop
Reviewed-on: #214
|
2 years ago |
|
Chengliang
|
88d53422e1
|
测试
|
2 years ago |
|
dxfeng
|
27d07db87e
|
编制信息在编数递归统计
|
2 years ago |
|
liang.cheng
|
442c4fe200
|
Merge pull request '测试' (#213) from feature/cl into develop
Reviewed-on: #213
|
2 years ago |
|
Chengliang
|
7dc5ee4fe9
|
测试
|
2 years ago |
|
liang.cheng
|
4387020b06
|
Merge pull request '测试编制' (#212) from feature/cl into develop
Reviewed-on: #212
|
2 years ago |
|
Chengliang
|
d90906cb2e
|
测试编制
|
2 years ago |
|
liang.cheng
|
89cd9761f5
|
Merge pull request '测试' (#211) from feature/cl into develop
Reviewed-on: #211
|
2 years ago |
|
Chengliang
|
21cd02c72a
|
测试
|
2 years ago |
|
dxfeng
|
19b844ed89
|
编制信息导入重复校验
|
2 years ago |
|
dxfeng
|
640892bcb2
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
liang.cheng
|
311d7b6fd8
|
Merge pull request 'feature/cl' (#210) from feature/cl into develop
Reviewed-on: #210
|
2 years ago |
|
dxfeng
|
7c8f209268
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
Chengliang
|
7cb3b019a8
|
编制模块
|
2 years ago |
|
Chengliang
|
eee636230d
|
编制模块
|
2 years ago |
|
Chengliang
|
d8d69381ea
|
编制模块
|
2 years ago |
|
Chengliang
|
498da847b3
|
编制模块修改
|
2 years ago |
|
Chengliang
|
a52ef7ecb2
|
脚本
|
2 years ago |
|
dxfeng
|
e8bcb4af99
|
花名册台账字段展示BUG修复
|
2 years ago |
|
dxfeng
|
8155466a96
|
分权管理BUG修复
|
2 years ago |
|
liang.cheng
|
a0f703099e
|
Merge pull request 'feature/cl' (#208) from feature/cl into develop
Reviewed-on: #208
|
2 years ago |
|
dxfeng
|
b3982dff2e
|
花名册台账字段展示BUG修复
|
2 years ago |
|
dxfeng
|
a288ebd311
|
花名册台账字段展示BUG修复
|
2 years ago |
|
Chengliang
|
51dc953766
|
企通学配置
|
2 years ago |
|
Chengliang
|
a94cdc7e37
|
企通学配置自定义
|
2 years ago |
|
liang.cheng
|
d9ca391a6e
|
Merge pull request '企通学单点' (#207) from feature/cl into develop
Reviewed-on: #207
|
2 years ago |
|
Chengliang
|
bb68a3bc7a
|
企通学单点
|
2 years ago |
|
dxfeng
|
75fd02be5f
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
cf7ac82356
|
分权管理BUG修复
|
2 years ago |
|
dxfeng
|
24485eff0d
|
Merge pull request 'feature/dxf' (#206) from feature/dxf into develop
Reviewed-on: #206
|
2 years ago |
|
dxfeng
|
058aa353e5
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
liang.cheng
|
e4c1f4dba6
|
Merge pull request '11' (#205) from feature/cl into develop
Reviewed-on: #205
|
2 years ago |
|
dxfeng
|
8e681bc639
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
Chengliang
|
b1d506cf15
|
11
|
2 years ago |
|
dxfeng
|
7e8a9f2556
|
职级、岗位序列分权
|
2 years ago |
|
dxfeng
|
d1d1f4dbbe
|
Merge pull request 'feature/dxf' (#204) from feature/dxf into develop
Reviewed-on: #204
|
2 years ago |
|
dxfeng
|
79b395fc37
|
等级方案、职等分权
|
2 years ago |
|
dxfeng
|
acccc9537c
|
分权新增、更新功能重构
|
2 years ago |
|
dxfeng
|
d0214ca5af
|
非标SQL记录
|
2 years ago |
|
dxfeng
|
2bcc0ae131
|
组织架构图显示部门
|
2 years ago |
|
dxfeng
|
ec7bd987b2
|
人员快捷搜索BUG修复
|
2 years ago |
|
dxfeng
|
a3380ce0bd
|
人员快捷搜索BUG修复
|
2 years ago |
|
liang.cheng
|
0c4bf4eead
|
Merge pull request '修复日期' (#203) from feature/cl into develop
Reviewed-on: #203
|
2 years ago |
|
Chengliang
|
8c2a9937f9
|
修复日期
|
2 years ago |
|
liang.cheng
|
2d600e4cd2
|
Merge pull request '测试' (#201) from feature/cl into develop
Reviewed-on: #201
|
2 years ago |
