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

925 Commits

Author SHA1 Message Date
dxfeng 9a2eabc8bd 部门切换数据源、实体类更新 2022-11-29 09:54:18 +08:00
dxfeng aa3d0742ff 分部接口整理、代码优化 2022-11-28 11:15:54 +08:00
dxfeng 8c5106d06b Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-24 17:56:50 +08:00
dxfeng 416471a283 分部列表、新增、删除、转移功能重写 2022-11-24 17:56:32 +08:00
liang.cheng 7ae74df165 Merge pull request 'v1.0版本封版' (#76) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/76
 2022-11-23 17:13:47 +08:00
Chengliang 682a98764d v1.0版本封版 2022-11-23 15:43:32 +08:00
dxfeng fac0fcd96d Merge pull request '人员导入提示信息优化' (#75) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/75
 2022-11-23 09:39:03 +08:00
dxfeng 701f597f78 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-23 09:37:21 +08:00
dxfeng f7758e5298 人员导入提示信息优化 2022-11-23 09:34:06 +08:00
dxfeng 80d504aff8 Merge pull request '人员同步BUG修复，导入优化' (#74) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/74
 2022-11-22 09:42:38 +08:00
dxfeng 36299d3cd2 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-22 09:41:29 +08:00
dxfeng 5d2b880ed5 人员同步BUG修复，导入优化 2022-11-22 09:41:11 +08:00
dxfeng 0e97abfc9c Merge pull request '人员Mapper整合' (#73) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/73
 2022-11-21 11:02:36 +08:00
dxfeng ae2e5bb5a4 人员Mapper整合 2022-11-21 10:58:12 +08:00
dxfeng 7d1fc84fad 组织架构树排序、人员卡片BUG修复 2022-11-18 16:28:02 +08:00
dxfeng 5e950415ff Merge pull request '导入BUG，提示信息优化' (#72) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/72
 2022-11-17 18:53:59 +08:00
dxfeng e45ff3daa3 导入BUG，提示信息优化 2022-11-17 17:02:45 +08:00
dxfeng 7990d67914 Merge pull request '导入BUG，提示信息优化' (#71) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/71
 2022-11-17 15:42:26 +08:00
dxfeng 25d3db4d81 导入BUG，提示信息优化 2022-11-17 15:36:26 +08:00
dxfeng a89ab0cbae Merge pull request '导入BUG，提示信息优化' (#70) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/70
 2022-11-17 11:38:17 +08:00
dxfeng 98ed590274 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-17 11:37:07 +08:00
dxfeng a273008715 导入BUG，提示信息优化 2022-11-17 11:36:52 +08:00
dxfeng f72f6c08b1 Merge pull request '导入自动编号' (#69) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/69
 2022-11-17 09:07:29 +08:00
dxfeng 4b8c0c1b8b Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-17 09:06:20 +08:00
dxfeng 0404c4b7fd 导入自动编号 2022-11-17 09:05:00 +08:00
dxfeng 47c09cac9a 导入自动编号 2022-11-16 17:54:57 +08:00
dxfeng 347632e301 Merge pull request '编制、分部树排序、人事卡片按钮权限BUG' (#68) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/68
 2022-11-16 17:42:21 +08:00
dxfeng 81943df058 编制、分部树排序 2022-11-16 17:39:58 +08:00
dxfeng 197007ceb5 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-16 16:17:04 +08:00
dxfeng 9b20c6838a 人事卡片按钮权限BUG 2022-11-16 16:09:32 +08:00
dxfeng e130908126 Merge pull request 'BUG修复' (#67) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/67
 2022-11-16 15:29:14 +08:00
dxfeng 49b4358e17 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-16 15:24:34 +08:00
dxfeng f9f5bc432c BUG修复 2022-11-16 15:23:56 +08:00
‘ml’ b5d5b717d1 职务导入提示优化修复20221116 2022-11-16 15:14:11 +08:00
dxfeng 0315da18b1 Merge pull request 'BUG修复' (#66) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/66
 2022-11-16 15:01:21 +08:00
dxfeng 17f4789e33 BUG修复 2022-11-16 14:59:22 +08:00
dxfeng 67fd2df4f9 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-16 14:58:48 +08:00
liang.cheng b3bfad0148 Merge pull request '“栏目表格修复”' (#65) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/65
 2022-11-16 14:08:40 +08:00
Chengliang cb4db723e4 “栏目表格修复” 2022-11-16 14:06:12 +08:00
dxfeng 05364f9265 BUG修复 2022-11-16 13:39:56 +08:00
‘ml’ caa9604315 职级导入异常处理方案1116 2022-11-16 11:22:28 +08:00
dxfeng bb071c3ad9 Merge pull request '花名册树、角色展示、组织透视下拉框' (#64) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/64
 2022-11-15 14:35:16 +08:00
dxfeng 2d64a5015b 组织透视下拉框BUG 2022-11-15 14:34:16 +08:00
‘ml’ 706edd43ed 职级导入提示优化1115 2022-11-15 14:24:06 +08:00
dxfeng 4fc2eca27b 花名册树、角色展示BUG 2022-11-15 11:47:54 +08:00
dxfeng f8497aa3e6 Merge pull request '明细表BUG修复' (#63) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/63
 2022-11-15 08:59:43 +08:00
dxfeng f1a3565fc7 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-15 08:56:58 +08:00
dxfeng 10bb8159aa 明细表BUG修复 2022-11-14 19:13:35 +08:00
‘ml’ 0bcdbc9de8 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-11-14 17:30:06 +08:00
‘ml’ 306897c5bc 职务导入模板提示修复1114 2022-11-14 17:29:55 +08:00