Commit Graph

1257 Commits

Author SHA1 Message Date
dxfeng 665172325e 职等职级BUG修复 2022-12-20 16:52:36 +08:00
Mlin 6dcb5db15f 动态字段查询 2022-12-20 15:36:39 +08:00
dxfeng 5f58197544 Merge pull request '岗位浏览按钮BUG修复' (#109) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/109
2022-12-20 15:18:52 +08:00
dxfeng a080ebea22 岗位浏览按钮BUG修复 2022-12-20 15:17:36 +08:00
dxfeng d29a37954a Merge pull request '部门合并、转移。岗位同步BUG修复' (#108) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/108
2022-12-20 13:54:39 +08:00
dxfeng 30bec2120a Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-20 13:53:35 +08:00
dxfeng 31a26dec08 部门合并、转移。岗位同步BUG修复 2022-12-20 13:53:18 +08:00
Mlin b8158cdcec oracle版数据同步问题 2022-12-20 10:57:46 +08:00
dxfeng 865e810b4c Merge pull request 'BUG修复' (#107) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/107
2022-12-20 09:30:32 +08:00
dxfeng ebf7a1bdda Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-20 09:28:39 +08:00
dxfeng e7cc13ed60 BUG修复 2022-12-20 09:13:11 +08:00
Mlin 30898d0eee oracle环境存入版本bug修复、新增职等职级1220 2022-12-20 09:02:51 +08:00
Mlin 0128de79ea oracle环境存入版本bug修复、新增职等职级1219 2022-12-19 19:24:28 +08:00
dxfeng dddc427066 Merge pull request 'BUG修复' (#106) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/106
2022-12-19 16:05:03 +08:00
dxfeng a7a0966e23 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-19 16:03:50 +08:00
dxfeng 2b0c1d0a69 BUG修复 2022-12-19 16:00:47 +08:00
dxfeng f2f222530b Merge pull request 'Oracle版本BUG修复' (#105) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/105
2022-12-19 11:35:36 +08:00
dxfeng d21d3148bf Oracle版本BUG修复 2022-12-19 11:34:53 +08:00
Mlin 5bcd3e22fc oracle环境存入版本bug修复1219 2022-12-19 08:44:37 +08:00
Mlin 806d18e511 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-16 18:32:18 +08:00
Mlin a5cc902c10 oracle环境存入版本bug修复 2022-12-16 18:31:50 +08:00
dxfeng ecbd5c0ca3 Merge pull request 'BUG修复' (#104) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/104
2022-12-16 18:29:56 +08:00
dxfeng b11251701a BUG修复 2022-12-16 18:29:12 +08:00
Mlin afe4813427 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-16 16:39:28 +08:00
Mlin 78d08ea740 无历史版本返回为空 2022-12-16 16:39:09 +08:00
dxfeng a35bb7716e Merge pull request 'BUG修复' (#103) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/103
2022-12-16 16:32:22 +08:00
dxfeng c86e37495d Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-16 16:26:01 +08:00
dxfeng b9cfe839e7 BUG修复 2022-12-16 16:21:54 +08:00
Mlin 78dfc87f61 同步数据接口 2022-12-16 15:58:20 +08:00
Mlin 0b89abeaac Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-16 14:25:48 +08:00
Mlin 981ea3ad4a 存为版本取消存入map表,同步接口 2022-12-16 14:25:30 +08:00
dxfeng 70f0cfcc9c Merge pull request '根据职等职级字段,补充人员信息' (#102) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/102
2022-12-16 14:25:26 +08:00
dxfeng 659261245d Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-16 14:24:58 +08:00
dxfeng 434dbacb64 根据职等职级字段,补充人员信息 2022-12-16 14:24:40 +08:00
dxfeng 66e1c77e3b Merge pull request '根据职等职级字段,补充人员信息' (#101) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/101
2022-12-16 13:57:39 +08:00
dxfeng ebe5003df9 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-16 13:54:03 +08:00
dxfeng f428dff5a0 根据职等职级字段,补充人员信息 2022-12-16 13:53:47 +08:00
Mlin b59f3a9d9f 定时任务刷新在岗数bug修复 2022-12-16 10:13:52 +08:00
Mlin 8cda66dc8b bug修复 2022-12-15 20:29:58 +08:00
Mlin 241bf47710 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-15 19:52:04 +08:00
Mlin 184a9e375f 版本查询接口二版 2022-12-15 19:51:04 +08:00
liang.cheng afa66c74c1 Merge pull request '岗位刷新功能' (#100) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/100
2022-12-15 18:58:33 +08:00
Mlin 95d53a6d8c Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-15 18:57:44 +08:00
Mlin faaed265fe 版本查询接口初版 2022-12-15 18:57:32 +08:00
Chengliang 4105600770 岗位刷新功能 2022-12-15 18:56:25 +08:00
liang.cheng d439dc8944 Merge pull request '岗位增加刷新按钮' (#99) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/99
2022-12-15 17:04:15 +08:00
Chengliang 4d8948724e 岗位增加刷新按钮 2022-12-15 16:58:08 +08:00
dxfeng e26e780310 Merge pull request 'BUG修复' (#98) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/98
2022-12-15 16:57:09 +08:00
dxfeng 1db4a85d46 BUG修复 2022-12-15 16:13:21 +08:00
Mlin 569a3132c1 分部、部门、人员封存后取消架构图展示 2022-12-15 15:16:40 +08:00