 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 |
Mlin
|
f04216a113
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2023-06-01 09:01:18 +08:00 |
|
Mlin
|
6cea2706df
|
人员简历表格动态生成
|
2023-06-01 09:00:55 +08:00 |
|
dxfeng
|
aff2c5b485
|
Merge pull request '兼容PostgreSQL,简历按钮BUG修复' (#160) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/160
|
2023-05-31 09:50:04 +08:00 |
|
dxfeng
|
3a8aa2449a
|
兼容PostgreSQL,简历按钮BUG修复
|
2023-05-29 11:35:45 +08:00 |
|
dxfeng
|
fe30e86d12
|
Merge pull request '兼容PostgreSQL' (#159) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/159
|
2023-05-29 09:06:58 +08:00 |
|
dxfeng
|
e138489c34
|
兼容PostgreSQL
|
2023-05-25 08:59:51 +08:00 |
|
dxfeng
|
db990ce227
|
兼容PostgreSQL
|
2023-05-16 16:42:28 +08:00 |
|
dxfeng
|
f0257e367b
|
Merge pull request 'feature/dxf' (#158) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/158
|
2023-05-09 11:20:00 +08:00 |
|
dxfeng
|
03845251b1
|
初始化在编数JSP
|
2023-05-09 11:12:41 +08:00 |
|
dxfeng
|
7f0021ad0f
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2023-05-09 09:30:08 +08:00 |
|
dxfeng
|
83ef362e45
|
初始化在编数JSP
|
2023-05-09 09:29:44 +08:00 |
|
dxfeng
|
fb8fb8758c
|
Merge pull request '花名册列表按钮权限优化' (#157) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/157
|
2023-04-03 15:33:03 +08:00 |
|
dxfeng
|
0ca51f58ae
|
花名册列表按钮权限优化
|
2023-04-03 10:06:02 +08:00 |
|
Mlin
|
472cc4ab9a
|
人大金仓版本bug处理
|
2023-03-24 14:24:55 +08:00 |
|
dxfeng
|
0cd9f94a93
|
Merge pull request '花名册人员状态查询功能优化' (#156) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/156
|
2023-03-01 16:26:52 +08:00 |
|
dxfeng
|
f8b60493f8
|
花名册人员状态查询功能优化
|
2023-03-01 16:26:10 +08:00 |
|
dxfeng
|
9ef15079b0
|
Merge pull request '人员身份证号码导入BUG修复' (#155) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/155
|
2023-03-01 11:06:11 +08:00 |
|
dxfeng
|
f5f5c26133
|
人员身份证号码导入BUG修复
|
2023-03-01 09:54:22 +08:00 |