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

1069 Commits

Author SHA1 Message Date
Mlin 950da74ac8 人员岗位显示bug修复 2022-12-22 11:26:09 +08:00
Mlin 347e3505d1 多个部门负责人存入版本bug修复 2022-12-21 16:26:21 +08:00
Mlin 7b9a82dda9 多部门负责人截取显示bug修复 2022-12-21 15:45:49 +08:00
Mlin 4a0949b6b1 多部门负责人截取显示bug修复 2022-12-21 15:13:16 +08:00
Mlin 18b50a4431 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-21 14:54:07 +08:00
Mlin d231bf3bd3 多部门负责人截取显示 2022-12-21 14:53:56 +08:00
dxfeng 452cfeecc6 Merge pull request '人员导出BUG' (#113) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/113
 2022-12-21 13:44:45 +08:00
dxfeng 8c6becc29c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-21 13:41:42 +08:00
Mlin fbac015a99 部门转移岗位重复bug修复 2022-12-21 13:40:19 +08:00
dxfeng eac5424171 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-21 13:39:13 +08:00
dxfeng 23eae34062 人员导出BUG 2022-12-21 13:38:53 +08:00
dxfeng a19c2f2f26 Merge pull request '部门导入BUG修复' (#112) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/112
 2022-12-21 11:07:34 +08:00
dxfeng a6ed99fc60 部门导入BUG修复 2022-12-21 11:06:14 +08:00
Mlin 33106aaaec sqlserver版本存入、部门转移 2022-12-21 10:58:49 +08:00
dxfeng 5791e53fb5 Merge pull request '多部门负责人BUG修复' (#111) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/111
 2022-12-20 18:18:39 +08:00
dxfeng b7938cfb6b 多部门负责人BUG修复 2022-12-20 18:17:40 +08:00
dxfeng f237400510 Merge pull request '职等职级BUG修复' (#110) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/110
 2022-12-20 16:54:25 +08:00
dxfeng 4ca7eeb93c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-20 16:52:52 +08:00
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