Commit Graph

761 Commits (03845251b19dcb72686ccfe0dfccd5c7464b89cb)

Author SHA1 Message Date
dxfeng 0ca51f58ae 花名册列表按钮权限优化 2 years ago
Mlin 472cc4ab9a 人大金仓版本bug处理 2 years ago
dxfeng f8b60493f8 花名册人员状态查询功能优化 2 years ago
dxfeng f5f5c26133 人员身份证号码导入BUG修复 2 years ago
dxfeng 2d63ca20a7 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng cb41ff1f8c 岗位浏览按钮SQL完善 2 years ago
Mlin 41fdd36997 透视图在岗数bug修复 2 years ago
dxfeng 453d4afe97 花名册查询、导出BUG修复 2 years ago
dxfeng 4113df1708 简历树,聚才林岗位搜索BUG修复 2 years ago
dxfeng eaca9535d5 分部、部门导入BUG修复 2 years ago
dxfeng 559ea407ab 岗位分权,部门列表BUG修复 2 years ago
dxfeng 6ac651e8bd 花名册,状态查询功能完善 2 years ago
dxfeng ec7ff05616 列定制BUG修复 2 years ago
dxfeng 37ded0a19b 列定制BUG修复 2 years ago
dxfeng 8947e6da3a 列定制BUG修复 2 years ago
dxfeng 5e40c18df1 列定制BUG修复 2 years ago
Mlin 4b4754bd74 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin 2b5acfeb32 花名册模板管理bug修复 2 years ago
dxfeng 7dc6225356 Merge pull request 'BUG修复' (#145) from feature/dxf into develop
Reviewed-on: #145
2 years ago
dxfeng ba2909bac9 BUG修复 2 years ago
Mlin 8ff8340d81 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin 9d36b42da6 花名册模板管理日期优化 2 years ago
dxfeng 0aac4a0c57 BUG修复 2 years ago
dxfeng ec55baf5fe BUG修复 2 years ago
dxfeng 6d8aaf063b BUG修复 2 years ago
Mlin 547264d755 花名册模板列定制优化20230113 2 years ago
Mlin 78682a47c7 花名册模板列定制优化20230113 2 years ago
Mlin 58d5bccddc 花名册模板列定制列名称获取优化20230113 2 years ago
Mlin 07a82baf9c Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin 5c44a11ff3 花名册模板列定制功能优化20230113 2 years ago
dxfeng 1bb7b67133 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng 1c9dce7c0b BUG修复 2 years ago
Mlin 2fba3b50b9 Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
#	src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
#	src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
2 years ago
Mlin e3a78a05c7 花名册模板列定制20230113 2 years ago
dxfeng ebb4e88d0d BUG修复 2 years ago
dxfeng f79ad8681f BUG修复 2 years ago
dxfeng 563070a539 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng 15b14cf4b1 显示定制列穿梭框接口开发 2 years ago
Mlin a395024010 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin a677da06a6 花名册模板管理查询、编辑保存20230112 2 years ago
dxfeng cb814ef077 显示定制列穿梭框接口开发 2 years ago
dxfeng b93a3d7b1c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng a7b1f33e1a 显示定制列穿梭框接口开发 2 years ago
Mlin 044f963f31 Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
#	src/com/engine/organization/service/HrmResourceService.java
#	src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
#	src/com/engine/organization/web/HrmResourceController.java
#	src/com/engine/organization/wrapper/HrmResourceWrapper.java
2 years ago
Mlin 8750850dfa 花名册列定制模板查询20230112 2 years ago
Mlin 09d4dbddd5 花名册列定制模板查询20230112 2 years ago
dxfeng 0f73f6e3ac 显示定制列穿梭框接口开发 2 years ago
dxfeng d5ca665f2f 显示定制列穿梭框接口开发 2 years ago
Mlin f86562c802 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin 71c427d1ec 花名册自定义字段展示20230111 2 years ago