270 Commits

Author SHA1 Message Date
杜建超
a686b49517 fix 2020-12-09 16:04:06 +08:00
杜建超
50915b9f6b fix 2020-12-09 16:03:40 +08:00
杜建超
1973ad96ca fix 2020-12-09 15:49:40 +08:00
杜建超
196727b8a0 fix 2020-12-09 14:40:31 +08:00
杜建超
095b4bf655 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-09 14:40:02 +08:00
杜建超
80d1e4c315 fix 2020-12-09 14:39:58 +08:00
wulin
d58d2ceb2d 解决冲突 2020-12-09 14:39:30 +08:00
wulin
54113f4869 增加detail 2020-12-09 14:37:45 +08:00
杜建超
80e1041b6b Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-09 14:31:25 +08:00
杜建超
373529c485 fix 2020-12-09 14:31:20 +08:00
wulin
de90f8b10a 解决冲突 2020-12-09 14:26:33 +08:00
wulin
367db0a8f8 增加排序字段 2020-12-09 14:25:58 +08:00
杜建超
9dc42c3414 fix 2020-12-09 14:22:55 +08:00
杜建超
bd6f92ee76 fix 2020-12-09 10:55:38 +08:00
杜建超
2bba48672c fix 2020-12-08 18:43:41 +08:00
杜建超
5b68b85c53 fix 2020-12-07 17:03:07 +08:00
杜建超
0ef31ffe9d fix 2020-12-04 10:26:06 +08:00
杜建超
1d1ea48651 fix 2020-12-02 16:48:12 +08:00
杜建超
26cdb127fb fix 2020-12-02 16:03:40 +08:00
杜建超
36036f61f1 fix 2020-12-02 15:56:19 +08:00
杜建超
4aa65d3468 fix 2020-12-01 18:16:05 +08:00
杜建超
65753426df fix 2020-12-01 13:56:39 +08:00
杜建超
e8d2155210 fix 2020-11-25 14:17:22 +08:00
wulin
c7f2afdbfa 编辑组时权限里面单独加绩效管理人员时,导致前端展示不一致问题 2020-11-24 11:12:58 +08:00
杜建超
2e5036d2e6 fix 2020-11-20 16:19:48 +08:00
wulin
cbf0ced7f5 增加部分氢气惧日志 2020-11-20 10:16:06 +08:00
杜建超
c227832a0e fix 2020-11-20 09:55:38 +08:00
杜建超
b16c903f3a ix 2020-11-19 11:32:00 +08:00
杜建超
0bb94e4b24 fix 2020-11-18 17:51:20 +08:00
杜建超
74e745dd04 fix 2020-11-18 11:05:58 +08:00
杜建超
c6d78c73c5 fix 2020-11-17 18:08:35 +08:00
杜建超
76e70c8b1f fix 2020-11-17 15:11:01 +08:00
杜建超
62986d16d4 fix 2020-11-17 10:09:24 +08:00
杜建超
650bbd91a5 fix 2020-11-16 17:01:36 +08:00
杜建超
2c7e95212c fi 2020-11-16 15:51:02 +08:00
杜建超
c9ef0e6261 fix 2020-11-13 17:46:48 +08:00
杜建超
b126bea492 fix 2020-11-13 17:46:05 +08:00
杜建超
b934f54d98 fix 2020-11-13 17:40:04 +08:00
杜建超
f4e4f74276 fix 2020-11-13 11:46:45 +08:00
杜建超
d03e2d998f fix 2020-11-13 11:25:13 +08:00
杜建超
4e118ab79e fix 2020-11-13 09:54:59 +08:00
杜建超
c5e4c71400 fix 2020-11-12 17:47:19 +08:00
杜建超
3d9afe5e4f Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-11-12 17:19:24 +08:00
杜建超
32e04d5b1f fix 2020-11-12 17:19:17 +08:00
wulin
865858c80c 优化获取节点的权限 2020-11-12 13:57:17 +08:00
wulin
513ede5708 修复中途插入绩效时,无法生成模板中的指标 2020-11-12 12:38:25 +08:00
wulin
6ae642147f Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-11-12 12:02:39 +08:00
wulin
541238c9cf 修复两个bug 2020-11-12 12:02:33 +08:00
杜建超
0efa107ef7 fix 2020-11-12 09:50:13 +08:00
杜建超
a3d18513a4 fix 2020-11-12 09:48:49 +08:00