 dxfeng
|
0b3cd0641b
|
分权开发
|
2022-10-28 17:43:46 +08:00 |
 Chengliang
|
1e08772a9d
|
分权开关设置
|
2022-10-28 17:41:56 +08:00 |
|
dxfeng
|
157217400f
|
Merge pull request '代码合并' (#30) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/30
|
2022-10-28 10:37:00 +08:00 |
|
dxfeng
|
40f1f097e6
|
代码合并
|
2022-10-28 10:35:33 +08:00 |
|
liang.cheng
|
19cccb9345
|
Merge pull request 'feature/detach' (#29) from feature/detach into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/29
|
2022-10-28 09:36:40 +08:00 |
|
dxfeng
|
2d40f6be3b
|
Merge pull request '组织架构图相关BUG修复' (#28) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/28
|
2022-10-27 19:13:03 +08:00 |
|
dxfeng
|
3989161281
|
组织架构图相关BUG修复
|
2022-10-27 19:11:58 +08:00 |
|
Chengliang
|
47c64b6797
|
模块管理分权
|
2022-10-27 15:06:50 +08:00 |
|
Chengliang
|
ef392f4d0a
|
模块管理分权
|
2022-10-27 15:00:12 +08:00 |
‘ml’
|
1be79b9698
|
分部、部门、岗位禁用修复1024
|
2022-10-27 15:00:07 +08:00 |
|
‘ml’
|
939e6c7607
|
分部转移、部门转移、岗位合并修复1021
|
2022-10-27 14:59:57 +08:00 |
|
Chengliang
|
96cefec891
|
模块管理分权
|
2022-10-27 14:58:44 +08:00 |
|
Chengliang
|
f6ea4425cf
|
模块管理分权
|
2022-10-27 14:58:44 +08:00 |
|
Chengliang
|
4c74b583bf
|
模块管理分权
|
2022-10-27 14:58:44 +08:00 |
|
Chengliang
|
2b975e6636
|
模块管理分权中心接口
|
2022-10-27 14:58:44 +08:00 |
|
dxfeng
|
19f3907807
|
Merge pull request '组织架构图相关BUG修复' (#27) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/27
|
2022-10-27 14:40:45 +08:00 |
|
dxfeng
|
92b246b5d5
|
组织架构图相关BUG修复
|
2022-10-27 14:39:35 +08:00 |
|
dxfeng
|
946a0006b4
|
Merge pull request '组织架构图相关BUG修复' (#26) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/26
|
2022-10-27 09:10:49 +08:00 |
|
dxfeng
|
679c77f732
|
组织架构图相关BUG修复
|
2022-10-26 20:12:14 +08:00 |
|
dxfeng
|
06179dbaa8
|
Merge pull request '编制、人员编号、岗位部门、自定义下拉框BUG修复' (#25) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/25
|
2022-10-25 16:25:46 +08:00 |
|
dxfeng
|
7258ee742d
|
编制模板优化
|
2022-10-25 16:24:18 +08:00 |
|
dxfeng
|
b2fc9d3e0c
|
人员编号、岗位部门、自定义下拉框BUG修复
|
2022-10-25 15:43:02 +08:00 |
|
dxfeng
|
eeb21315c7
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2022-10-25 11:29:05 +08:00 |
|
dxfeng
|
a36648ea39
|
花名册树BUG
|
2022-10-25 11:09:14 +08:00 |
|
‘ml’
|
f2c5d1227b
|
分部、部门、岗位禁用、合并修复1025
|
2022-10-25 10:47:08 +08:00 |
|
‘ml’
|
e198209705
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2022-10-25 09:03:16 +08:00 |
|
dxfeng
|
b578c66495
|
Merge pull request '更新人员Map表信息' (#24) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/24
|
2022-10-25 09:00:16 +08:00 |
|
dxfeng
|
594173175c
|
更新人员Map表信息
|
2022-10-25 08:59:24 +08:00 |
|
dxfeng
|
3cf48e443a
|
Merge pull request '人员导入、花名册左侧树BUG修复' (#23) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/23
|
2022-10-24 19:07:17 +08:00 |
|
dxfeng
|
b446dbdb53
|
人员导入、花名册左侧树BUG修复
|
2022-10-24 19:06:07 +08:00 |
|
‘ml’
|
f30998351f
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/thread/CompanyTriggerRunnable.java
# src/com/engine/organization/thread/DepartmentTriggerRunnable.java
|
2022-10-24 16:01:51 +08:00 |
|
‘ml’
|
65ccecce56
|
分部、部门、岗位禁用修复1024
|
2022-10-24 16:00:00 +08:00 |
|
dxfeng
|
7e1e1eae5c
|
Merge pull request 'SQL脚本、编制导入模板、人员卡片、组织架构图Oracle' (#22) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/22
|
2022-10-24 15:57:46 +08:00 |
|
dxfeng
|
dca18ea5b1
|
编制导入模板、人员卡片、组织架构图Oracle
|
2022-10-24 15:57:08 +08:00 |
|
dxfeng
|
d9bdda1fa6
|
SQL脚本调整
|
2022-10-24 15:56:03 +08:00 |
|
dxfeng
|
771996f138
|
Merge pull request '人员相关BUG修复' (#21) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/21
|
2022-10-21 17:46:00 +08:00 |
|
dxfeng
|
3b4c59ae8c
|
人员相关BUG修复
|
2022-10-21 17:44:53 +08:00 |
|
dxfeng
|
2515121d83
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2022-10-21 15:58:13 +08:00 |
|
dxfeng
|
11a4a85ff1
|
人员关联调整
|
2022-10-21 15:57:55 +08:00 |
|
‘ml’
|
05fe14b5e1
|
分部转移、部门转移、岗位合并修复1021
|
2022-10-21 15:53:15 +08:00 |
|
‘ml’
|
444153f44d
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2022-10-21 15:52:37 +08:00 |
|
liang.cheng
|
89554625ca
|
Merge pull request 'develop' (#20) from develop into master
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/20
|
2022-10-21 10:24:27 +08:00 |
|
liang.cheng
|
1708f8e821
|
Merge pull request '建表' (#19) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/19
|
2022-10-21 10:03:23 +08:00 |
|
Chengliang
|
545ec88e07
|
建表
|
2022-10-21 10:01:37 +08:00 |
|
‘ml’
|
887a1eafe3
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2022-10-21 09:47:27 +08:00 |
|
dxfeng
|
7004300ebb
|
Merge pull request '人员关联调整' (#18) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/18
|
2022-10-21 09:32:27 +08:00 |
|
dxfeng
|
275b017db1
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2022-10-21 09:31:06 +08:00 |
|
dxfeng
|
52c8b86adb
|
人员关联调整
|
2022-10-21 09:28:33 +08:00 |
|
‘ml’
|
9a9b79cff0
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2022-10-20 17:31:23 +08:00 |
|
‘ml’
|
a0660a7857
|
分部转移、部门转移、岗位合并修复1020
|
2022-10-20 17:30:34 +08:00 |