Commit Graph

1284 Commits

Author SHA1 Message Date
dxfeng d2e1cacfa1 组织架构图,人员列表添加key 2023-07-06 14:10:39 +08:00
dxfeng 7809f9ad3c 组织架构图,人员头像 2023-07-06 13:55:48 +08:00
dxfeng 14135f0e47 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-06 13:31:13 +08:00
dxfeng 436decbc85 组织架构图,人员列表显示转换调整 2023-07-06 13:30:39 +08:00
dxfeng a3aadebeeb Merge pull request 'feature/dxf' (#178) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/178
2023-07-06 10:48:43 +08:00
dxfeng c3476e3659 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-06 10:47:48 +08:00
dxfeng 38656dde58 组织架构图,部门负责人、主次账号 2023-07-06 10:47:34 +08:00
dxfeng 79f64f7f93 组织架构图,列表字段转换、卡片在岗数统计 2023-07-06 10:06:38 +08:00
dxfeng 46849d161d Merge pull request '组织架构图,人员卡片' (#177) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/177
2023-07-05 18:14:24 +08:00
dxfeng 49036ba704 组织架构图,人员卡片 2023-07-05 18:13:43 +08:00
dxfeng e47e8dd330 Merge pull request 'feature/dxf' (#176) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/176
2023-07-05 17:56:22 +08:00
dxfeng 603f7f606a 组织架构图,人员卡片 2023-07-05 17:54:58 +08:00
dxfeng 5559a4322a Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-05 17:41:47 +08:00
dxfeng e760eae9a0 组织架构图,人员卡片 2023-07-05 17:41:30 +08:00
liang.cheng dd99d0e0f5 Merge pull request '组织架构图' (#175) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/175
2023-07-05 17:37:59 +08:00
Chengliang 9ffd5c3cfb 组织架构图 2023-07-05 17:36:04 +08:00
liang.cheng d1e4908971 Merge pull request '组织架构图' (#174) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/174
2023-07-05 09:24:08 +08:00
Chengliang 2e58769c8b 组织架构图 2023-07-05 09:16:17 +08:00
dxfeng 0592b4dae1 Merge pull request '组织架构图重构-异步数据接口;TODO注释清理' (#173) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/173
2023-07-03 10:53:06 +08:00
dxfeng d28f1f783c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-03 10:50:22 +08:00
dxfeng a2247ddb12 TODO注释清理 2023-07-03 10:50:07 +08:00
dxfeng c115308f9e 组织架构图重构-异步数据接口 2023-07-03 10:49:48 +08:00
dxfeng 2a6807e855 Merge pull request '组织架构图重构-BUG修复' (#172) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/172
2023-06-30 17:13:57 +08:00
dxfeng 78c4aa5127 组织架构图重构-BUG修复 2023-06-30 17:12:58 +08:00
dxfeng 15e88e5b48 Merge pull request '组织架构图重构' (#171) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/171
2023-06-30 16:49:44 +08:00
dxfeng c993cafab4 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-06-30 16:45:19 +08:00
dxfeng 4e919dea65 组织架构图重构 2023-06-30 16:44:56 +08:00
liang.cheng 94de6f7c85 Merge pull request '架构图' (#170) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/170
2023-06-30 16:41:56 +08:00
Chengliang b963913d62 架构图 2023-06-29 17:37:05 +08:00
liang.cheng 5edb1cc55b Merge pull request 'feature/cl' (#168) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/168
2023-06-28 18:05:07 +08:00
Chengliang 2667ab8a60 修复条件 2023-06-28 17:58:12 +08:00
Chengliang 53a295a468 虚拟组织暂存 2023-06-27 16:58:45 +08:00
dxfeng 0e1e6d5bb6 Merge pull request '组织树添加key字段' (#167) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/167
2023-06-27 10:27:56 +08:00
dxfeng 98b85ac75f 组织树添加key字段 2023-06-27 10:24:51 +08:00
liang.cheng 3f28e7b095 Merge pull request '搜索条件修改' (#166) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/166
2023-06-27 10:13:06 +08:00
Chengliang c696835a33 搜索条件修改 2023-06-27 10:09:05 +08:00
dxfeng c38a758129 Merge pull request '组织架构图搜索条件优化、Resin编译 异常、警告处理' (#165) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/165
2023-06-27 09:19:11 +08:00
dxfeng e8d6f2ea73 组织架构图搜索条件优化 2023-06-27 09:12:41 +08:00
dxfeng 0148d99314 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-06-26 17:03:51 +08:00
liang.cheng 5b320e874b Merge pull request '组织架构图V3' (#164) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/164
2023-06-26 17:02:39 +08:00
Chengliang 35d7a045e2 组织架构图V3 2023-06-26 17:00:12 +08:00
dxfeng 13c39d5fd0 Resin编译 异常、警告处理 2023-06-21 11:42:21 +08:00
dxfeng 03ba211f28 Merge pull request '岗位新增BUG修复' (#163) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/163
2023-06-09 14:24:32 +08:00
dxfeng 745761ba41 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-06-09 14:19:59 +08:00
dxfeng a1dd6126b0 岗位新增BUG修复 2023-06-09 14:19:32 +08:00
dxfeng a8508f1446 Merge pull request '人员批量导入 BUG修复' (#162) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/162
2023-06-09 09:12:36 +08:00
dxfeng cdd2e6384e 人员批量导入 BUG修复 2023-06-08 15:56:06 +08:00
dxfeng 4a8652a8b3 Merge pull request '聚才林岗位新增功能' (#161) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/161
2023-06-01 15:53:47 +08:00
dxfeng 7889b866ab Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-06-01 14:18:45 +08:00
dxfeng 2ec00b7bb3 聚才林岗位新增功能 2023-06-01 14:12:12 +08:00