290 Commits

Author SHA1 Message Date
杜建超
3c1607e1ec Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-10 10:05:35 +08:00
杜建超
870f1ffc27 fix 2020-12-10 10:05:29 +08:00
quyixiao
1f2d90857a 提交修改 2020-12-09 18:33:12 +08:00
quyixiao
75912655ab 提交修改 2020-12-09 18:33:01 +08:00
wulin
82700a091c 修复获取任务确实bug 2020-12-09 18:07:23 +08:00
杜建超
39474fd69c fix 2020-12-09 17:39:37 +08:00
杜建超
d6c1a0f9c3 fix 2020-12-09 17:16:33 +08:00
杜建超
782132ad3b fix 2020-12-09 17:02:56 +08:00
杜建超
2c7a0c9fad Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-09 17:02:16 +08:00
杜建超
c640f7b00c fix 2020-12-09 17:02:08 +08:00
wulin
512f2d9592 解决冲突 2020-12-09 17:02:06 +08:00
wulin
f7a89b666f Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-09 16:55:35 +08:00
wulin
7d2fd8da46 完成绩效详情任务的支持 2020-12-09 16:55:31 +08:00
杜建超
781ab99b4a fix 2020-12-09 16:47:21 +08:00
杜建超
f50e0c831c fix 2020-12-09 16:41:14 +08:00
wulin
73ee332287 新增部分代码 2020-12-09 16:36:52 +08:00
杜建超
d3db1d61fe fix 2020-12-09 16:32:18 +08:00
杜建超
8bac3406fb fix 2020-12-09 16:23:29 +08:00
杜建超
a85f4a937a fix 2020-12-09 16:08:43 +08:00
wulin
86f244d091 新增部分代码 2020-12-09 16:05:17 +08:00
杜建超
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