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

1393 Commits

Author SHA1 Message Date
dxfeng 13c39d5fd0 Resin编译 异常、警告处理 2023-06-21 11:42:21 +08:00
dxfeng 03ba211f28 Merge pull request '岗位新增BUG修复' (#163) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/163
 2023-06-09 14:24:32 +08:00
dxfeng 745761ba41 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-06-09 14:19:59 +08:00
dxfeng a1dd6126b0 岗位新增BUG修复 2023-06-09 14:19:32 +08:00
dxfeng a8508f1446 Merge pull request '人员批量导入 BUG修复' (#162) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/162
 2023-06-09 09:12:36 +08:00
dxfeng cdd2e6384e 人员批量导入 BUG修复 2023-06-08 15:56:06 +08:00
dxfeng 4a8652a8b3 Merge pull request '聚才林岗位新增功能' (#161) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/161
 2023-06-01 15:53:47 +08:00
dxfeng 7889b866ab Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-06-01 14:18:45 +08:00
dxfeng 2ec00b7bb3 聚才林岗位新增功能 2023-06-01 14:12:12 +08:00
Mlin f04216a113 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-06-01 09:01:18 +08:00
Mlin 6cea2706df 人员简历表格动态生成 2023-06-01 09:00:55 +08:00
dxfeng aff2c5b485 Merge pull request '兼容PostgreSQL,简历按钮BUG修复' (#160) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/160
 2023-05-31 09:50:04 +08:00
dxfeng 3a8aa2449a 兼容PostgreSQL,简历按钮BUG修复 2023-05-29 11:35:45 +08:00
dxfeng fe30e86d12 Merge pull request '兼容PostgreSQL' (#159) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/159
 2023-05-29 09:06:58 +08:00
dxfeng e138489c34 兼容PostgreSQL 2023-05-25 08:59:51 +08:00
dxfeng db990ce227 兼容PostgreSQL 2023-05-16 16:42:28 +08:00
dxfeng f0257e367b Merge pull request 'feature/dxf' (#158) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/158
 2023-05-09 11:20:00 +08:00
dxfeng 03845251b1 初始化在编数JSP 2023-05-09 11:12:41 +08:00
dxfeng 7f0021ad0f Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-05-09 09:30:08 +08:00
dxfeng 83ef362e45 初始化在编数JSP 2023-05-09 09:29:44 +08:00
dxfeng fb8fb8758c Merge pull request '花名册列表按钮权限优化' (#157) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/157
 2023-04-03 15:33:03 +08:00
dxfeng 0ca51f58ae 花名册列表按钮权限优化 2023-04-03 10:06:02 +08:00
Mlin 472cc4ab9a 人大金仓版本bug处理 2023-03-24 14:24:55 +08:00
dxfeng 0cd9f94a93 Merge pull request '花名册人员状态查询功能优化' (#156) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/156
 2023-03-01 16:26:52 +08:00
dxfeng f8b60493f8 花名册人员状态查询功能优化 2023-03-01 16:26:10 +08:00
dxfeng 9ef15079b0 Merge pull request '人员身份证号码导入BUG修复' (#155) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/155
 2023-03-01 11:06:11 +08:00
dxfeng f5f5c26133 人员身份证号码导入BUG修复 2023-03-01 09:54:22 +08:00
dxfeng 35b50cb244 Merge pull request '岗位浏览按钮SQL完善' (#154) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/154
 2023-02-20 14:35:11 +08:00
dxfeng 2d63ca20a7 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-02-20 14:33:39 +08:00
dxfeng cb41ff1f8c 岗位浏览按钮SQL完善 2023-02-20 14:28:25 +08:00
Mlin 41fdd36997 透视图在岗数bug修复 2023-02-14 18:06:00 +08:00
dxfeng 488d24460d Merge pull request '花名册查询、导出BUG修复' (#153) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/153
 2023-02-14 17:20:32 +08:00
dxfeng 3789edf32a Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-02-14 17:18:58 +08:00
dxfeng 453d4afe97 花名册查询、导出BUG修复 2023-02-14 17:09:22 +08:00
dxfeng 2f4beb3767 Merge pull request '简历树，聚才林岗位搜索BUG修复' (#152) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/152
 2023-02-10 09:18:54 +08:00
dxfeng 4113df1708 简历树，聚才林岗位搜索BUG修复 2023-02-08 14:05:33 +08:00
dxfeng f29ca425ec Merge pull request '岗位分权，部门列表，分部、部门导入BUG修复' (#151) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/151
 2023-02-07 14:43:52 +08:00
dxfeng 29e1ed93f6 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-02-07 14:41:51 +08:00
dxfeng eaca9535d5 分部、部门导入BUG修复 2023-02-07 14:41:31 +08:00
dxfeng 559ea407ab 岗位分权，部门列表BUG修复 2023-02-07 11:29:13 +08:00
dxfeng a1a91b2cb8 Merge pull request '花名册，状态查询功能完善' (#150) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/150
 2023-02-06 09:51:06 +08:00
dxfeng 6ac651e8bd 花名册，状态查询功能完善 2023-02-06 09:49:36 +08:00
dxfeng 0afff811c0 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-02-03 09:51:40 +08:00
dxfeng 1cc568f738 Merge pull request '列定制BUG修复' (#149) from danikor into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/149
 2023-01-17 14:54:03 +08:00
dxfeng ec7ff05616 列定制BUG修复 2023-01-17 14:52:45 +08:00
dxfeng 571b0bcdfc Merge pull request '列定制BUG修复' (#148) from danikor into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/148
 2023-01-17 09:31:47 +08:00
dxfeng 37ded0a19b 列定制BUG修复 2023-01-17 09:30:51 +08:00
dxfeng d68cfcee95 Merge pull request '列定制BUG修复' (#147) from danikor into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/147
 2023-01-16 17:22:23 +08:00
dxfeng 8947e6da3a 列定制BUG修复 2023-01-16 17:19:59 +08:00
dxfeng d207134980 Merge pull request '列定制BUG修复' (#146) from danikor into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/146
 2023-01-16 15:09:23 +08:00