Commit Graph

713 Commits

Author SHA1 Message Date
dxfeng 48c8101a34 Merge pull request 'feature/dxf' (#10) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/10
2022-10-14 09:16:42 +08:00
dxfeng b2670001b4 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-10-14 09:15:39 +08:00
dxfeng f9c33da655 人员管理完善 2022-10-14 09:13:28 +08:00
dxfeng 46068ab008 编制Action 添加提示信息,BUG修复 2022-10-13 13:59:41 +08:00
dxfeng 585746c723 Merge pull request 'feature/dxf' (#9) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/9
2022-10-12 15:30:37 +08:00
dxfeng c538a6205f Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-10-12 15:28:32 +08:00
dxfeng 3ac7c2b959 聚才林花名册 2022-10-12 15:28:11 +08:00
dxfeng f26159506a 岗位浏览按钮、编制action BUG修复 2022-10-12 15:23:24 +08:00
‘ml’ c78f2157f8 层级显示不一致优化 2022-10-10 18:24:07 +08:00
liang.cheng b31d5943bd Merge pull request '编制删除' (#8) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/8
2022-10-10 17:37:56 +08:00
Chengliang eb5578fd64 编制删除 2022-10-10 17:35:48 +08:00
dxfeng 9df3349715 兼容EC岗位名称重复 2022-10-09 15:36:53 +08:00
dxfeng eb8424816f Merge pull request 'feature/dxf' (#7) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/7
2022-10-09 11:45:37 +08:00
dxfeng a7a3d1e0e5 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-10-09 11:43:27 +08:00
dxfeng 231addfda1 人事卡片接口开发 2022-10-09 11:42:26 +08:00
dxfeng 8289ae1c56 Merge pull request 'feature/dxf' (#6) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/6
2022-09-30 15:31:48 +08:00
dxfeng ed937c9fb6 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-09-30 15:26:10 +08:00
dxfeng 284f778963 人员调整,在岗数关联优化 2022-09-30 15:19:22 +08:00
dxfeng acee0bad51 人员调整,在岗数关联优化 2022-09-30 11:05:42 +08:00
dxfeng dfb3067297 Merge pull request '组织架构图编制、在岗,数据优化' (#5) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/5
2022-09-30 09:12:17 +08:00
dxfeng c6fb0d129b 组织架构图编制、在岗,数据优化 2022-09-29 15:57:00 +08:00
liang.cheng f16391fc9b Merge pull request 'bug' (#4) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/4
2022-09-29 10:29:35 +08:00
Chengliang ca3a093357 bug 2022-09-29 10:28:04 +08:00
dxfeng cc77f3a6db Merge pull request 'feature/dxf' (#3) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/3
2022-09-23 15:57:06 +08:00
dxfeng 02836ce37d 岗位名称校验、编制展示优化、BUG修复 2022-09-23 15:53:37 +08:00
dxfeng 92d9a17d8c 组织架构图编制显示优化 2022-09-23 09:19:42 +08:00
dxfeng 106d7e8bb8 更新人员、编制 同步组织架构图 2022-09-21 16:23:09 +08:00
dxfeng 02e3a40cb7 Merge pull request 'feature/dxf' (#2) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/2
2022-09-21 10:49:15 +08:00
dxfeng 7eb7a93397 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-09-21 10:45:26 +08:00
dxfeng a847a4efef 兼容Oracle,达梦 2022-09-21 10:43:41 +08:00
dxfeng 8a9370ee9e BUG修复 2022-09-20 18:46:05 +08:00
liang.cheng aa48ea933f Merge pull request '测试' (#1) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/1
2022-09-20 14:26:48 +08:00
Chengliang 61aabb4ca1 测试 2022-09-20 14:24:26 +08:00
dxfeng 38725f97b0 BUG修复 2022-09-20 14:19:46 +08:00
dxfeng 7d99eb0a3a
!244 BUG修复
Merge pull request !244 from dxfeng/feature/dxf
2022-09-20 02:25:53 +00:00
dxfeng 2632f6c857 BUG修复 2022-09-20 10:25:13 +08:00
dxfeng b214ec8509 BUG修复 2022-09-20 09:18:24 +08:00
dxfeng 672f0f9e11 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-09-19 13:28:14 +08:00
dxfeng fe668c37e7 BUG修复 2022-09-19 13:27:50 +08:00
dxfeng c49abcf77f BUG修复 2022-09-16 16:56:30 +08:00
dxfeng c8eb2f3451 BUG修复 2022-09-16 14:48:00 +08:00
dxfeng abf5840f72
!243 BUG修复
Merge pull request !243 from dxfeng/feature/dxf
2022-09-16 03:29:20 +00:00
dxfeng 1b4d7203b8 BUG修复 2022-09-16 11:28:47 +08:00
dxfeng b494a6a96e BUG修复 2022-09-16 11:01:31 +08:00
dxfeng e9e585990a
!242 BUG修复
Merge pull request !242 from dxfeng/feature/dxf
2022-09-16 02:23:08 +00:00
dxfeng ca66929235 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-09-16 10:22:52 +08:00
dxfeng 29295bb464 BUG修复 2022-09-16 10:22:15 +08:00
dxfeng 1ea9dd5768
!241 编制导入
Merge pull request !241 from dxfeng/feature/dxf
2022-09-15 10:40:41 +00:00
dxfeng 4b3bb0d5f3 编制导入 2022-09-15 18:40:05 +08:00
dxfeng 2457cdd2a8
!240 编制导入
Merge pull request !240 from dxfeng/feature/dxf
2022-09-15 10:31:50 +00:00