liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,029 Commits 23 Branches 0 Tags 6.7 MiB
Commit Graph

1029 Commits

Author SHA1 Message Date
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
Mlin 3be6bf11a2 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-15 14:39:06 +08:00
Mlin b3057e2f4e 版本查询接口 2022-12-15 14:38:48 +08:00
dxfeng 84a5fc3879 Merge pull request 'BUG修复' (#97) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/97
 2022-12-15 10:02:27 +08:00
Mlin 3462511603 showOrder类型小数转换 2022-12-15 09:59:57 +08:00
dxfeng 550be7fb14 BUG修复 2022-12-15 09:49:55 +08:00
Mlin 7f51135424 定时任务 2022-12-14 17:42:59 +08:00
Mlin 94690cbd86 定时任务 2022-12-14 17:42:23 +08:00
dxfeng f0c02597a8 Merge pull request 'BUG修复' (#96) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/96
 2022-12-14 15:40:01 +08:00
dxfeng 42545745fe Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-14 15:38:59 +08:00
dxfeng 946354b32d BUG修复 2022-12-14 15:38:29 +08:00
Mlin 1db1949a94 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-14 14:32:40 +08:00
Mlin 43f00f7d9d sqlserver存入版本修复、定时任务 2022-12-14 14:32:19 +08:00
dxfeng bee48accdd Merge pull request 'BUG修复' (#95) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/95
 2022-12-14 10:59:02 +08:00
dxfeng d2f6fa693a Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-14 10:58:09 +08:00
dxfeng 4117a34928 BUG修复 2022-12-14 10:52:20 +08:00
dxfeng 8383c08a06 BUG修复 2022-12-13 18:19:12 +08:00
Mlin 9c80a74386 oracle、sqlserver查询版本语句(部门存入失败) 2022-12-13 16:38:06 +08:00
dxfeng 1f9c632f0b Merge pull request '分权功能版本回退，岗位BUG修复' (#94) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/94
 2022-12-13 16:01:53 +08:00
dxfeng b9d06b4246 分权功能版本回退，岗位BUG修复 2022-12-13 15:57:21 +08:00
Mlin 5897ae1563 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-13 15:01:11 +08:00
Mlin e81d8f4939 oracle、sqlserver查询版本语句 2022-12-13 14:58:22 +08:00
dxfeng 2832a8ff46 Merge pull request '分权功能重构，调用EC方法' (#93) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/93
 2022-12-13 11:00:07 +08:00