653 Commits

Author SHA1 Message Date
quyixiao
c221ee5ff8 提交修改 2020-11-06 09:58:18 +08:00
quyixiao
58a4606a0d 提交修改 2020-11-06 09:36:02 +08:00
quyixiao
3c8547c3bc 提交修改 2020-11-06 09:35:27 +08:00
杜建超
ec47988039 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-11-06 09:23:27 +08:00
杜建超
9946d69282 fix 2020-11-06 09:23:23 +08:00
wulin
d4738c4da3 修改 2020-11-05 18:21:33 +08:00
wulin
770f0f25b5 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-11-05 18:18:04 +08:00
wulin
a183e27678 保存流程节点是如果不传不走类型,默认设置为依次 2020-11-05 18:18:00 +08:00
quyixiao
f0020edfe7 提交修改 2020-11-05 17:37:00 +08:00
quyixiao
660a4ebf5d 提交修改 2020-11-05 17:36:27 +08:00
wulin
35fdbd38c2 保存绩效详情优化 2020-11-05 17:19:11 +08:00
wulin
4decad63c1 保存绩效详情页去掉对权重之和的限制 2020-11-05 17:10:16 +08:00
wulin
ac012346ec Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-11-05 16:28:20 +08:00
wulin
1c2322f1b9 保存绩效详情时,增加对maxCount的判断限制 2020-11-05 16:28:17 +08:00
杜建超
ad1f580ab6 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-11-05 16:13:09 +08:00
杜建超
915a624785 fix 2020-11-05 16:13:05 +08:00
wulin
b0b3c44a61 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-11-05 16:03:20 +08:00
quyixiao
500793fabb 提交修改 2020-11-05 16:02:01 +08:00
wulin
7792a17e14 更新 2020-11-05 16:01:03 +08:00
quyixiao
5e1f037b6b 合并提交修改 2020-11-05 15:37:51 +08:00
杜建超
4bd721cb44 fix 2020-11-05 15:25:59 +08:00
杜建超
b2075bf6a5 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-11-05 15:25:13 +08:00
杜建超
492df7f53f fix 2020-11-05 15:25:05 +08:00
quyixiao
803d0d9003 提交修改 2020-11-05 15:19:17 +08:00
quyixiao
ff9be7b0f7 提交修改 2020-11-05 15:18:06 +08:00
quyixiao
0f3bb66fef 合并提交修改 2020-11-05 14:57:14 +08:00
wulin
2fcf78de15 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-11-05 14:56:22 +08:00
wulin
9902aa3b4f 修复发起bug 2020-11-05 14:56:16 +08:00
杜建超
cd74b557c1 fix 2020-11-05 14:07:50 +08:00
quyixiao
0178bcde83 提交修改 2020-11-05 10:38:57 +08:00
quyixiao
65fb40f651 提交修改 2020-11-05 10:31:05 +08:00
quyixiao
c3378a8021 提交修改 2020-11-05 10:12:04 +08:00
quyixiao
6f5cbf0cc6 提交修改 2020-11-05 10:11:33 +08:00
杜建超
19c1647992 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-11-05 09:17:21 +08:00
杜建超
db353c890e fix 2020-11-05 09:17:14 +08:00
wulin
b44664876f 打开认证 2020-11-05 09:11:51 +08:00
杜建超
a95005be4e Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-11-04 16:19:39 +08:00
杜建超
518c23c82b fix 2020-11-04 16:19:32 +08:00
wulin
99bace6039 批量推送时如果没有第三方id,查询 2020-11-04 16:14:17 +08:00
杜建超
aeea27efbf Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-11-04 16:01:02 +08:00
杜建超
0920ae649f fix 2020-11-04 16:00:58 +08:00
wulin
62c3bd9883 当保存考评组时一个维度都没有,或者全部维度删除时的处理 2020-11-04 14:54:04 +08:00
wulin
c706c343b6 不限权重的支持 2020-11-04 14:48:54 +08:00
wulin
3acb7a3efe 没有具体的维度时的保存 2020-11-04 14:23:52 +08:00
wulin
dbad69aadc Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-11-04 11:33:34 +08:00
wulin
ebed4d36dd 增加批量推送 2020-11-04 11:33:23 +08:00
杜建超
a627676d60 fix 2020-11-04 10:58:01 +08:00
wulin
d76be4273e 增加消息类型 2020-11-04 09:37:18 +08:00
wulin
1e03654f2d Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-11-03 17:46:15 +08:00
wulin
49b5ded432 优化发起任务 2020-11-03 17:46:11 +08:00