Mlin
|
50ee698cc2
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2023-07-31 09:44:19 +08:00 |
|
Mlin
|
1a307f9923
|
部门合并，名称占用释放
|
2023-07-31 09:43:23 +08:00 |
 dxfeng
|
59d4fac4e2
|
组织管理，部门封存传参，树结构优化
|
2023-07-31 09:29:10 +08:00 |
|
dxfeng
|
29bfcdc418
|
组织管理，分部封存传参
|
2023-07-28 11:33:14 +08:00 |
|
dxfeng
|
3fa679b139
|
组织管理，树结构兼容是否封存
|
2023-07-27 17:45:02 +08:00 |
|
dxfeng
|
4414b347f0
|
Merge pull request '组织管理，TreeSelect组件全量接口开发' (#199) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/199
|
2023-07-27 14:46:23 +08:00 |
|
dxfeng
|
1280b3c6b9
|
组织管理，TreeSelect组件全量接口开发
|
2023-07-27 14:32:07 +08:00 |
|
dxfeng
|
b74d06bf07
|
Merge pull request '组织管理，移动树接口提交' (#198) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/198
|
2023-07-26 16:08:37 +08:00 |
|
dxfeng
|
b1b24fc925
|
组织管理，移动树接口提交
|
2023-07-26 11:23:15 +08:00 |
|
dxfeng
|
7ab3436182
|
Merge pull request 'feature/dxf' (#197) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/197
|
2023-07-26 10:55:09 +08:00 |
|
dxfeng
|
9610361733
|
组织管理，移动树接口提交
|
2023-07-26 10:52:10 +08:00 |
|
dxfeng
|
87372be17f
|
组织管理，编制导入BUG修复
|
2023-07-25 16:46:08 +08:00 |
|
dxfeng
|
820b13b932
|
Merge pull request 'feature/dxf' (#196) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/196
|
2023-07-25 09:59:17 +08:00 |
|
dxfeng
|
46ecec4b17
|
组织管理，岗位台账、岗位浏览按钮列表展示优化
|
2023-07-25 09:56:32 +08:00 |
|
dxfeng
|
fab01583ad
|
组织架构图，部门选择树
|
2023-07-24 16:38:17 +08:00 |
|
dxfeng
|
f4c29de76b
|
新建编制信息初始化在编数
|
2023-07-24 10:32:10 +08:00 |
|
Mlin
|
2ee38ccc0c
|
版本管理代码优化
|
2023-07-17 14:30:44 +08:00 |
 liang.cheng
|
691b4764b4
|
Merge pull request '排序 时间轴' (#195) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/195
|
2023-07-14 15:08:29 +08:00 |
|
Chengliang
|
d9e2a695cf
|
排序 时间轴
|
2023-07-14 15:04:11 +08:00 |
|
Mlin
|
775405741a
|
版本管理，事务控制bug优化
|
2023-07-14 15:00:49 +08:00 |
|
Mlin
|
0a809a29c9
|
版本管理，事务控制bug优化
|
2023-07-14 14:46:05 +08:00 |
|
Mlin
|
1abbc7cddf
|
版本记录，未新增分部类型、部门类型字段时同步bug修复
|
2023-07-14 11:40:04 +08:00 |
|
Mlin
|
7417cbac79
|
虚拟维度表查询bug修复
|
2023-07-14 10:51:30 +08:00 |
|
Mlin
|
8ac0f45d29
|
版本记录，虚拟人员bug修复
|
2023-07-13 18:05:17 +08:00 |
|
Mlin
|
3d7b5927b3
|
版本记录，虚拟人员bug修复
|
2023-07-13 17:51:16 +08:00 |
|
Mlin
|
45b663217f
|
版本记录，分部bug修复
|
2023-07-13 17:16:22 +08:00 |
|
Mlin
|
7d1b7b8795
|
版本记录，虚拟人员bug修复
|
2023-07-13 16:58:22 +08:00 |
|
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 |