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

799 Commits

Author SHA1 Message Date
liang.cheng 41370fe770 Merge pull request '人员卡片权限接口' (#37) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/37
 2022-11-02 17:46:38 +08:00
Chengliang afcbbcefb1 人员卡片权限接口 2022-11-02 17:44:52 +08:00
dxfeng d743cafac0 Merge pull request '聚才林岗位分权' (#36) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/36
 2022-11-02 14:32:44 +08:00
dxfeng 18767b722c 聚才林岗位分权 2022-11-02 14:30:22 +08:00
dxfeng a85cc10aab Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-02 14:26:20 +08:00
liang.cheng 121927dba8 Merge pull request '人员卡片类型权限' (#35) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/35
 2022-11-02 11:31:54 +08:00
Chengliang b636dc2b82 人员卡片类型权限 2022-11-02 11:29:40 +08:00
dxfeng f6779ec20a Merge pull request '组织架构图分权功能' (#34) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/34
 2022-11-02 11:00:18 +08:00
dxfeng c42ac59eaf Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-02 10:55:34 +08:00
dxfeng be90013ca0 组织架构图分权功能 2022-11-02 10:55:15 +08:00
liang.cheng ac5eb30534 Merge pull request '人员卡片权限' (#33) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/33
 2022-11-01 17:55:07 +08:00
Chengliang 4e4cf54f8a 人员卡片权限 2022-11-01 17:53:31 +08:00
dxfeng 796487941c Merge pull request '分部、部门、岗位、人员 分权功能开发' (#32) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/32
 2022-11-01 10:18:30 +08:00
dxfeng 895528617b 分部、部门、岗位、人员 分权功能开发 2022-11-01 10:05:43 +08:00
dxfeng 955134dc28 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 
 Conflicts:
	src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java
 2022-10-31 11:40:05 +08:00
liang.cheng 73f3fac3b2 Merge pull request '分权开关设置' (#31) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/31
 2022-10-28 17:44:03 +08:00
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