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

1325 Commits

Author SHA1 Message Date
dxfeng 024d2a1591 Merge pull request 'feature/dxf' (#194) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/194
 2023-07-13 15:28:49 +08:00
dxfeng 696f66ec98 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-13 15:26:24 +08:00
dxfeng d510f32bc5 组织架构图，BUG修复 2023-07-13 15:26:11 +08:00
liang.cheng 772287869e Merge pull request 'v3' (#193) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/193
 2023-07-13 15:10:35 +08:00
Chengliang f5275c2148 v3 2023-07-13 15:08:24 +08:00
Mlin 725d64888c 组织管理版本记录int类型bug修复 2023-07-13 11:08:22 +08:00
Mlin 971b997dff Merge remote-tracking branch 'origin/develop' into feature/ml 
# Conflicts:
#	src/com/engine/organization/service/impl/ChartServiceImpl.java
 2023-07-12 18:04:23 +08:00
Mlin 10a9a350b4 组织管理版本记录数据同步 2023-07-12 18:00:47 +08:00
dxfeng 10983ab38a Merge pull request 'feature/dxf' (#192) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/192
 2023-07-12 17:01:08 +08:00
dxfeng a58e42d83c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-12 17:00:21 +08:00
dxfeng 62b25d6a65 组织架构图，回溯详细信息 2023-07-12 17:00:01 +08:00
dxfeng 7e0553c0d2 Merge pull request 'feature/dxf' (#191) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/191
 2023-07-12 16:14:49 +08:00
dxfeng c61a071746 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-12 16:13:21 +08:00
dxfeng 3bf299afa4 组织架构图，回溯详细信息 2023-07-12 16:13:08 +08:00
liang.cheng 8906b0753c Merge pull request '列表' (#190) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/190
 2023-07-12 16:11:20 +08:00
Chengliang 81f7ecfec9 列表 2023-07-12 16:09:04 +08:00
dxfeng 194ee20b77 Merge pull request '组织架构图，回溯详细信息' (#189) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/189
 2023-07-12 11:15:56 +08:00
dxfeng 151e77e69b 组织架构图，回溯详细信息 2023-07-12 11:15:11 +08:00
dxfeng bfa3d147fc Merge pull request 'feature/dxf' (#188) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/188
 2023-07-12 10:18:07 +08:00
dxfeng 104d94ba6f 组织架构图，回溯数据查询 2023-07-12 10:17:06 +08:00
dxfeng 775cf4a8ae Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-12 10:16:51 +08:00
Mlin 6befb0de03 Merge remote-tracking branch 'origin/develop' into feature/ml 
# Conflicts:
#	src/com/engine/organization/service/ChartService.java
#	src/com/engine/organization/service/impl/ChartServiceImpl.java
 2023-07-11 18:12:24 +08:00
Mlin 38f3e457ef 组织管理版本记录0711 2023-07-11 18:08:40 +08:00
liang.cheng 60de384cf6 Merge pull request 'v3' (#187) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/187
 2023-07-11 18:06:43 +08:00
Chengliang 1a188a1975 v3 2023-07-11 18:04:08 +08:00
dxfeng d4a6fb4a28 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-11 16:12:02 +08:00
dxfeng 075456caa9 组织架构图，<根结点>添加回溯联动 2023-07-11 16:11:49 +08:00
liang.cheng 4e5eacfb38 Merge pull request 'v3' (#186) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/186
 2023-07-11 16:08:30 +08:00
Chengliang 54abf562a4 v3 2023-07-11 16:06:23 +08:00
liang.cheng 914649a35b Merge pull request 'v3' (#185) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/185
 2023-07-11 15:25:59 +08:00
Chengliang 688eeb125c v3 2023-07-11 15:17:56 +08:00
dxfeng 44e684a2a4 Merge pull request '组织架构图，兼容PG数据库' (#184) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/184
 2023-07-11 11:22:02 +08:00
dxfeng c023822ca5 组织架构图，兼容PG数据库 2023-07-11 11:19:19 +08:00
dxfeng 1dc5f3ce4b Merge pull request '组织架构图，添加部门层级条件' (#183) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/183
 2023-07-07 14:55:14 +08:00
dxfeng a18e7a3dc7 组织架构图，添加部门层级条件 2023-07-07 14:54:21 +08:00
dxfeng bba7288c5d Merge pull request '组织架构图，岗位调整为查询聚才林岗位' (#182) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/182
 2023-07-07 10:20:58 +08:00
dxfeng eb28328219 组织架构图，岗位调整为查询聚才林岗位 2023-07-07 10:19:59 +08:00
dxfeng 45c623accd Merge pull request '修复并发情况下，岗位数据重复问题' (#181) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/181
 2023-07-06 17:06:20 +08:00
dxfeng d9ea8fe266 修复并发情况下，岗位数据重复问题 2023-07-06 17:03:31 +08:00
dxfeng b3f093a647 Merge pull request '组织架构图，人员列表添加key' (#180) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/180
 2023-07-06 14:11:19 +08:00
dxfeng d2e1cacfa1 组织架构图，人员列表添加key 2023-07-06 14:10:39 +08:00
dxfeng c7bfa8126a Merge pull request '组织架构图，人员列表显示转换调整' (#179) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/179
 2023-07-06 13:56:15 +08:00
dxfeng 7809f9ad3c 组织架构图，人员头像 2023-07-06 13:55:48 +08:00
dxfeng 14135f0e47 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-06 13:31:13 +08:00
dxfeng 436decbc85 组织架构图，人员列表显示转换调整 2023-07-06 13:30:39 +08:00
dxfeng a3aadebeeb Merge pull request 'feature/dxf' (#178) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/178
 2023-07-06 10:48:43 +08:00
dxfeng c3476e3659 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-06 10:47:48 +08:00
dxfeng 38656dde58 组织架构图，部门负责人、主次账号 2023-07-06 10:47:34 +08:00
dxfeng 79f64f7f93 组织架构图，列表字段转换、卡片在岗数统计 2023-07-06 10:06:38 +08:00
dxfeng 46849d161d Merge pull request '组织架构图，人员卡片' (#177) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/177
 2023-07-05 18:14:24 +08:00