Commit Graph

957 Commits

Author SHA1 Message Date
dxfeng c1c812596d BUG修复 2022-12-08 17:10:31 +08:00
dxfeng eaa1c53c9c 分部、部门联调。BUG修复 2022-12-08 14:37:48 +08:00
dxfeng f89ebdb965 分部、部门联调。BUG修复 2022-12-08 14:16:58 +08:00
dxfeng a1f2c9d1ac BUG修复 2022-12-08 11:24:48 +08:00
dxfeng ea8a48099f Merge pull request '人员导入逻辑重写' (#87) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/87
2022-12-08 11:04:35 +08:00
dxfeng 668231fd61 人员导入逻辑重写 2022-12-08 11:01:30 +08:00
liang.cheng 7ec2f0e56e Merge pull request '版本管理' (#86) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/86
2022-12-08 10:00:15 +08:00
Chengliang d345a5fe66 版本管理 2022-12-08 09:56:25 +08:00
dxfeng 990f4de8c4 Merge pull request '部门列表BUG修复' (#85) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/85
2022-12-07 14:17:41 +08:00
dxfeng de03ca3b8b 部门列表BUG修复 2022-12-07 14:15:02 +08:00
dxfeng 032eb26cee Merge pull request '部门列表BUG修复' (#84) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/84
2022-12-07 14:08:55 +08:00
dxfeng 3477539393 部门列表BUG修复 2022-12-07 14:08:03 +08:00
dxfeng bfaa56c606 Merge pull request '分部、部门,查看、编辑接口调整' (#83) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/83
2022-12-07 11:50:49 +08:00
dxfeng 37dc31b7b5 部门查看、编辑接口调整 2022-12-07 11:49:06 +08:00
dxfeng 6fc67d7d67 分部查看、编辑接口调整 2022-12-07 10:36:05 +08:00
dxfeng f17e8ade50 Merge pull request '分部、部门导入Excel批量新增、更新' (#82) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/82
2022-12-06 17:17:29 +08:00
dxfeng 64af65cad3 部门导入新增、更新 2022-12-06 17:11:48 +08:00
dxfeng 324881794b 分部导入新增、更新 2022-12-06 15:06:51 +08:00
dxfeng f938abd875 Merge pull request '分部BUG修复,导入接口逻辑重写' (#81) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/81
2022-12-06 14:50:26 +08:00
dxfeng 54c3676c07 分部BUG修复,导入接口逻辑重写 2022-12-06 14:47:50 +08:00
dxfeng a5d80f4619 Merge pull request '人员卡片查看页面逻辑重写' (#80) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/80
2022-12-05 17:59:39 +08:00
dxfeng b565d8c4d8 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-05 17:58:03 +08:00
dxfeng 85ec966813 人员卡片查看页面逻辑重写 2022-12-05 17:57:33 +08:00
dxfeng 34bab24a0c Merge pull request '分部、部门数据源调整;功能逻辑修改' (#79) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/79
2022-11-30 16:16:43 +08:00
dxfeng fb17f43323 部门管理功能逻辑调整 2022-11-30 16:14:23 +08:00
dxfeng bd33075e14 部门管理功能逻辑调整 2022-11-30 16:06:40 +08:00
dxfeng 40a6540a1d 部门管理功能逻辑调整 2022-11-30 15:55:27 +08:00
dxfeng 1c8c7ab2aa Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-29 17:05:14 +08:00
dxfeng 238d8e6f75 部门接口逻辑调整 2022-11-29 17:00:31 +08:00
dxfeng 9a2eabc8bd 部门切换数据源、实体类更新 2022-11-29 09:54:18 +08:00
dxfeng aa3d0742ff 分部接口整理、代码优化 2022-11-28 11:15:54 +08:00
liang.cheng 665f3af816 Merge pull request '建表' (#78) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/78
2022-11-25 17:36:51 +08:00
Chengliang e754d6f8fe 建表 2022-11-25 17:34:36 +08:00
dxfeng b8b3ed2380 Merge pull request '分部列表、新增、删除、转移功能重写' (#77) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/77
2022-11-24 17:59:41 +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