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

988 Commits

Author SHA1 Message Date
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
dxfeng fab4614cd5 分权功能重构，调用EC方法 2022-12-13 10:58:57 +08:00
dxfeng 63e2d1238f Merge pull request '分权功能重构、改造' (#92) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/92
 2022-12-13 10:48:22 +08:00
dxfeng ce2c34cfdd BUG修复,岗位关联关系调整 2022-12-13 10:42:35 +08:00
dxfeng 837a237ffc Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-13 09:01:22 +08:00
dxfeng c0ba7fb361 Merge pull request 'BUG修复,岗位关联关系调整' (#91) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/91
 2022-12-12 18:13:24 +08:00
dxfeng 32fd42db2f Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-12 18:11:59 +08:00
dxfeng b64f15bd83 BUG修复,岗位关联关系调整 2022-12-12 18:11:03 +08:00
Mlin 2b549bcc4a 人员版本控制写入逻辑 2022-12-12 17:55:50 +08:00
dxfeng 57cbf3db8b Merge pull request 'BUG修复,岗位关联关系调整' (#90) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/90
 2022-12-09 17:07:33 +08:00
dxfeng 6169b007ae Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-09 17:05:01 +08:00
Mlin 32e8eb4890 分部、部门版本控制写入逻辑 2022-12-09 16:57:42 +08:00
Mlin 1bdc7e2fa4 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-09 16:04:50 +08:00
Mlin 13ae136872 部门版本控制写入逻辑 2022-12-09 16:04:35 +08:00
dxfeng 45a24cb0be BUG修复,岗位关联关系调整 2022-12-09 15:39:15 +08:00
dxfeng 06c9912d21 BUG修复,岗位关联关系调整 2022-12-09 15:07:34 +08:00
dxfeng 6d2b452354 Merge pull request 'BUG修复、岗位关联关系调整' (#89) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/89
 2022-12-09 14:32:19 +08:00
dxfeng b20e473211 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-09 14:30:30 +08:00
dxfeng dee6bb25b5 岗位关联关系调整 2022-12-09 14:29:56 +08:00
dxfeng 3470ba04cd 岗位关联关系调整 2022-12-09 14:29:20 +08:00
Mlin 73dbaf75ac 分部版本控制写入逻辑 2022-12-09 08:50:23 +08:00
dxfeng b368c3ea27 BUG修复 2022-12-08 17:10:50 +08:00
dxfeng c1c812596d BUG修复 2022-12-08 17:10:31 +08:00
dxfeng eaa1c53c9c 分部、部门联调。BUG修复 2022-12-08 14:37:48 +08:00
dxfeng 6949775979 Merge pull request 'BUG修复' (#88) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/88
 2022-12-08 14:17:54 +08:00
dxfeng f89ebdb965 分部、部门联调。BUG修复 2022-12-08 14:16:58 +08:00
dxfeng a1f2c9d1ac BUG修复 2022-12-08 11:24:48 +08:00
dxfeng ea8a48099f Merge pull request '人员导入逻辑重写' (#87) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/87
 2022-12-08 11:04:35 +08:00
dxfeng 668231fd61 人员导入逻辑重写 2022-12-08 11:01:30 +08:00
liang.cheng 7ec2f0e56e Merge pull request '版本管理' (#86) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/86
 2022-12-08 10:00:15 +08:00
Chengliang d345a5fe66 版本管理 2022-12-08 09:56:25 +08:00
dxfeng 990f4de8c4 Merge pull request '部门列表BUG修复' (#85) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/85
 2022-12-07 14:17:41 +08:00
dxfeng de03ca3b8b 部门列表BUG修复 2022-12-07 14:15:02 +08:00
dxfeng 032eb26cee Merge pull request '部门列表BUG修复' (#84) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/84
 2022-12-07 14:08:55 +08:00
dxfeng 3477539393 部门列表BUG修复 2022-12-07 14:08:03 +08:00
dxfeng bfaa56c606 Merge pull request '分部、部门，查看、编辑接口调整' (#83) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/83
 2022-12-07 11:50:49 +08:00
dxfeng 37dc31b7b5 部门查看、编辑接口调整 2022-12-07 11:49:06 +08:00
dxfeng 6fc67d7d67 分部查看、编辑接口调整 2022-12-07 10:36:05 +08:00
dxfeng f17e8ade50 Merge pull request '分部、部门导入Excel批量新增、更新' (#82) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/82
 2022-12-06 17:17:29 +08:00
dxfeng 64af65cad3 部门导入新增、更新 2022-12-06 17:11:48 +08:00
dxfeng 324881794b 分部导入新增、更新 2022-12-06 15:06:51 +08:00
dxfeng f938abd875 Merge pull request '分部BUG修复，导入接口逻辑重写' (#81) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/81
 2022-12-06 14:50:26 +08:00