 liang.cheng
|
1708f8e821
|
Merge pull request '建表' (#19) from feature/cl into develop
Reviewed-on: #19
|
3 years ago |
|
Chengliang
|
545ec88e07
|
建表
|
3 years ago |
 dxfeng
|
7004300ebb
|
Merge pull request '人员关联调整' (#18) from feature/dxf into develop
Reviewed-on: #18
|
3 years ago |
|
dxfeng
|
52c8b86adb
|
人员关联调整
|
3 years ago |
|
dxfeng
|
c06ea6f2a7
|
Merge pull request '人员关联调整、BUG修复' (#17) from feature/dxf into develop
Reviewed-on: #17
|
3 years ago |
|
dxfeng
|
b7e34c1d31
|
人员关联调整
|
3 years ago |
|
dxfeng
|
a5687b3995
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
1c4ee05f95
|
人事卡片BUG修复
|
3 years ago |
‘ml’
|
adc92c8287
|
部门合并在岗数优化1019
|
3 years ago |
|
dxfeng
|
eb007f5b23
|
人事卡片BUG修复
|
3 years ago |
|
‘ml’
|
5005243758
|
部门合并在岗数优化
|
3 years ago |
|
dxfeng
|
95f81a4f00
|
Merge pull request '人员BUG修复' (#16) from feature/dxf into develop
Reviewed-on: #16
|
3 years ago |
|
dxfeng
|
414aefe41c
|
人事卡片BUG修复
|
3 years ago |
|
dxfeng
|
63b6b88a96
|
人员管理BUG修复
|
3 years ago |
|
dxfeng
|
0f57462192
|
Merge pull request 'BUG修复' (#15) from feature/dxf into develop
Reviewed-on: #15
|
3 years ago |
|
dxfeng
|
396a4570d0
|
BUG修复
|
3 years ago |
|
dxfeng
|
85fb8a1d19
|
Merge pull request '人员卡片BUG修复' (#14) from feature/dxf into develop
Reviewed-on: #14
|
3 years ago |
|
dxfeng
|
561477c47e
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
cd4d2c77bf
|
人员卡片BUG修复
|
3 years ago |
|
dxfeng
|
10a3921d54
|
Merge pull request '分部、岗位 禁用功能限制' (#13) from feature/dxf into develop
Reviewed-on: #13
|
3 years ago |
|
dxfeng
|
f36756e1fd
|
分部、岗位 禁用功能限制
|
3 years ago |
|
dxfeng
|
e2d988d83b
|
Merge pull request '部门转移BUG修复' (#12) from feature/dxf into develop
Reviewed-on: #12
|
3 years ago |
|
dxfeng
|
4a85fc46aa
|
部门转移BUG修复
|
3 years ago |
|
dxfeng
|
cb5235a16c
|
Merge pull request '人员卡片' (#11) from feature/dxf into develop
Reviewed-on: #11
|
3 years ago |
|
dxfeng
|
1d7389c872
|
人员卡片
|
3 years ago |
|
dxfeng
|
48c8101a34
|
Merge pull request 'feature/dxf' (#10) from feature/dxf into develop
Reviewed-on: #10
|
3 years ago |
|
dxfeng
|
b2670001b4
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
f9c33da655
|
人员管理完善
|
3 years ago |
|
dxfeng
|
46068ab008
|
编制Action 添加提示信息，BUG修复
|
3 years ago |
|
dxfeng
|
585746c723
|
Merge pull request 'feature/dxf' (#9) from feature/dxf into develop
Reviewed-on: #9
|
3 years ago |
|
dxfeng
|
c538a6205f
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
3ac7c2b959
|
聚才林花名册
|
3 years ago |
|
dxfeng
|
f26159506a
|
岗位浏览按钮、编制action BUG修复
|
3 years ago |
|
‘ml’
|
c78f2157f8
|
层级显示不一致优化
|
3 years ago |
|
liang.cheng
|
b31d5943bd
|
Merge pull request '编制删除' (#8) from feature/cl into develop
Reviewed-on: #8
|
3 years ago |
|
Chengliang
|
eb5578fd64
|
编制删除
|
3 years ago |
|
dxfeng
|
9df3349715
|
兼容EC岗位名称重复
|
3 years ago |
|
dxfeng
|
eb8424816f
|
Merge pull request 'feature/dxf' (#7) from feature/dxf into develop
Reviewed-on: #7
|
3 years ago |
|
dxfeng
|
a7a3d1e0e5
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
231addfda1
|
人事卡片接口开发
|
3 years ago |
|
dxfeng
|
8289ae1c56
|
Merge pull request 'feature/dxf' (#6) from feature/dxf into develop
Reviewed-on: #6
|
3 years ago |
|
dxfeng
|
ed937c9fb6
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
284f778963
|
人员调整,在岗数关联优化
|
3 years ago |
|
dxfeng
|
acee0bad51
|
人员调整,在岗数关联优化
|
3 years ago |
|
dxfeng
|
dfb3067297
|
Merge pull request '组织架构图编制、在岗,数据优化' (#5) from feature/dxf into develop
Reviewed-on: #5
|
3 years ago |
|
dxfeng
|
c6fb0d129b
|
组织架构图编制、在岗,数据优化
|
3 years ago |
|
liang.cheng
|
f16391fc9b
|
Merge pull request 'bug' (#4) from feature/cl into develop
Reviewed-on: #4
|
3 years ago |
|
Chengliang
|
ca3a093357
|
bug
|
3 years ago |
|
dxfeng
|
cc77f3a6db
|
Merge pull request 'feature/dxf' (#3) from feature/dxf into develop
Reviewed-on: #3
|
3 years ago |
|
dxfeng
|
02836ce37d
|
岗位名称校验、编制展示优化、BUG修复
|
3 years ago |
|
dxfeng
|
92d9a17d8c
|
组织架构图编制显示优化
|
3 years ago |
|
dxfeng
|
106d7e8bb8
|
更新人员、编制 同步组织架构图
|
3 years ago |
|
dxfeng
|
02e3a40cb7
|
Merge pull request 'feature/dxf' (#2) from feature/dxf into develop
Reviewed-on: #2
|
3 years ago |
|
dxfeng
|
7eb7a93397
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
a847a4efef
|
兼容Oracle,达梦
|
3 years ago |
|
dxfeng
|
8a9370ee9e
|
BUG修复
|
3 years ago |
|
liang.cheng
|
aa48ea933f
|
Merge pull request '测试' (#1) from feature/cl into develop
Reviewed-on: #1
|
3 years ago |
|
Chengliang
|
61aabb4ca1
|
测试
|
3 years ago |
|
dxfeng
|
38725f97b0
|
BUG修复
|
3 years ago |
|
dxfeng
|
7d99eb0a3a
|
!244 BUG修复
Merge pull request !244 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
2632f6c857
|
BUG修复
|
3 years ago |
|
dxfeng
|
b214ec8509
|
BUG修复
|
3 years ago |
|
dxfeng
|
672f0f9e11
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
fe668c37e7
|
BUG修复
|
3 years ago |
|
dxfeng
|
c49abcf77f
|
BUG修复
|
3 years ago |
|
dxfeng
|
c8eb2f3451
|
BUG修复
|
3 years ago |
|
dxfeng
|
abf5840f72
|
!243 BUG修复
Merge pull request !243 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
1b4d7203b8
|
BUG修复
|
3 years ago |
|
dxfeng
|
b494a6a96e
|
BUG修复
|
3 years ago |
|
dxfeng
|
e9e585990a
|
!242 BUG修复
Merge pull request !242 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
ca66929235
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
29295bb464
|
BUG修复
|
3 years ago |
|
dxfeng
|
1ea9dd5768
|
!241 编制导入
Merge pull request !241 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
4b3bb0d5f3
|
编制导入
|
3 years ago |
|
dxfeng
|
2457cdd2a8
|
!240 编制导入
Merge pull request !240 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
16fcd76468
|
编制导入
|
3 years ago |
|
dxfeng
|
9e0f34e680
|
!239 编制导入
Merge pull request !239 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
5522cb7058
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
50e5c7312e
|
编制导入
|
3 years ago |
|
dxfeng
|
db07451ece
|
!238 BUG 修复
Merge pull request !238 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
8b7b75b57b
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
35439a442f
|
BUG 修复
|
3 years ago |
|
reset
|
d4628f72ed
|
!237 顶部按钮修改
Merge pull request !237 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
fbd608a52a
|
顶部按钮修改
|
3 years ago |
|
dxfeng
|
81ad78cc82
|
!236 部门复制
Merge pull request !236 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
76b9cd2a89
|
部门复制
|
3 years ago |
|
dxfeng
|
62e4b33c37
|
!235 部门复制
Merge pull request !235 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
34d44b6c91
|
部门复制
|
3 years ago |
|
dxfeng
|
8e385537da
|
BUG修复
|
3 years ago |
|
dxfeng
|
3113ed1984
|
!234 部门合并、组织导入
Merge pull request !234 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
5c66744468
|
部门合并、组织导入
|
3 years ago |
|
dxfeng
|
f6c41a3467
|
部门合并重写
|
3 years ago |
|
reset
|
70aa760abc
|
!233 修复富文本长度
Merge pull request !233 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
6de1b0746f
|
修复富文本长度
|
3 years ago |
|
dxfeng
|
d6c1ea3bc7
|
!232 BUG修复
Merge pull request !232 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
0a87a2ad4d
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
reset
|
c204918352
|
!231 bug修复
Merge pull request !231 from reset/feature/cl
|
3 years ago |
|
dxfeng
|
91a8ad0bd3
|
导入BUG
|
3 years ago |
|
Chengliang
|
c280c5f908
|
fixed
|
3 years ago |
|
dxfeng
|
59f76c012c
|
触发器，分部、部门赋值，SQL脚本
|
3 years ago |
|
dxfeng
|
affcbf0e38
|
!230 BUG修复
Merge pull request !230 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
34af4f95c9
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
79c5f94862
|
导入问题处理
|
3 years ago |
|
dxfeng
|
120b4efdba
|
不同等级方案、编号可重复
|
3 years ago |
|
reset
|
2be21bc0e9
|
!229 fixed
Merge pull request !229 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
8553e37c22
|
fixed
|
3 years ago |
|
Chengliang
|
1c900eafc9
|
Merge remote-tracking branch 'origin/develop' into feature/cl
# Conflicts:
# src/com/engine/organization/service/impl/CompServiceImpl.java
|
3 years ago |
|
dxfeng
|
6765fd8fc4
|
左侧树排序
|
3 years ago |
|
Chengliang
|
ba0b31f086
|
fixed
|
3 years ago |
|
dxfeng
|
4cb7e0db46
|
!228 表结构更新
Merge pull request !228 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
900ded1aad
|
表结构更新
|
3 years ago |
|
dxfeng
|
0edebd1063
|
!227 分部、部门按钮；SQL脚本
Merge pull request !227 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
278d61c499
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
077945dfa1
|
表结构更新
|
3 years ago |
|
reset
|
493926e758
|
!226 fixed
Merge pull request !226 from reset/feature/cl
|
3 years ago |
|
dxfeng
|
6c04ffd384
|
编制管理
|
3 years ago |
|
dxfeng
|
6415ee3eb7
|
编制方案
|
3 years ago |
|
dxfeng
|
d65551c0ee
|
复制BUG修复
|
3 years ago |
|
dxfeng
|
b1b2a9a88a
|
部门管理，更新为EC
|
3 years ago |
|
dxfeng
|
4fa38f704c
|
分部管理，更新为EC
|
3 years ago |
|
dxfeng
|
f05cf6da8f
|
BUG修复
|
3 years ago |
