727 Commits

Author SHA1 Message Date
quyixiao
0948d5f24f 提交修改 2020-11-09 16:42:18 +08:00
quyixiao
929753989b 提交修改 2020-11-09 16:41:55 +08:00
wulin
55ced3dc09 大小写 2020-11-09 15:45:17 +08:00
wulin
c68e866d8f 解决bug 2020-11-09 15:32:58 +08:00
wulin
66d13ad154 修改计算公式的设置方法 2020-11-09 15:22:27 +08:00
quyixiao
2c17a09954 提交修改 2020-11-09 09:47:28 +08:00
quyixiao
c91e8e1607 提交修改 2020-11-09 09:46:26 +08:00
quyixiao
a376c46294 提交修改 2020-11-06 17:05:50 +08:00
quyixiao
10e027c2a0 提交修改 2020-11-06 17:05:28 +08:00
wulin
cfd82dfc1a 开启登录验证 2020-11-06 16:52:44 +08:00
wulin
9c211ed74e Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-11-06 16:42:30 +08:00
wulin
fe92a82f71 判断考评组重名搜索逻辑 2020-11-06 16:42:25 +08:00
quyixiao
c9ec84d314 提交修改 2020-11-06 16:17:32 +08:00
quyixiao
069de498f7 提交修改 2020-11-06 16:07:23 +08:00
quyixiao
3f8bc27a34 提交修改 2020-11-06 16:05:31 +08:00
quyixiao
43955bff8a 提交修改 2020-11-06 16:04:51 +08:00
杜建超
6f5a4105d2 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-11-06 15:41:52 +08:00
杜建超
9d185d4398 fix 2020-11-06 15:41:47 +08:00
wulin
2235ea4714 待办事项连接挤上去 2020-11-06 15:15:34 +08:00
wulin
f457c0d518 修改pom 2020-11-06 15:00:51 +08:00
wulin
5e9976a68b xiugai pom 2020-11-06 14:55:20 +08:00
wulin
b43c90e360 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-11-06 14:48:43 +08:00
wulin
87d5df18bc 去掉返回前端蜜柑信息 2020-11-06 14:48:19 +08:00
quyixiao
a556bbbb6b 提交修改 2020-11-06 11:14:53 +08:00
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