1088 Commits

Author SHA1 Message Date
quyixiao
61365c4407 rjuq whnt 2020-12-09 17:32:23 +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
e024de37e4 解决冲突 2020-12-09 16:56:53 +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
杜建超
964d6dd792 fix 2020-12-09 16:42:48 +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
杜建超
1ea511358b fix 2020-12-09 16:05:45 +08:00
wulin
86f244d091 新增部分代码 2020-12-09 16:05:17 +08:00
杜建超
b2134efefa fix 2020-12-09 16:05:15 +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
wulin
4f3343179f 对原有评论null的判断 2020-12-08 19:03:00 +08:00
wulin
9bdde9674c Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-08 19:01:11 +08:00
wulin
a370e7b80a 测试评论修改i 2020-12-08 19:01:06 +08:00
杜建超
2bba48672c fix 2020-12-08 18:43:41 +08:00
quyixiao
ff06c7537d 提交个民tgit pull 2020-12-08 18:22:29 +08:00
quyixiao
c6cf46407a 提交修改 2020-12-08 18:22:11 +08:00
杜建超
906171c8d5 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-08 17:29:48 +08:00
杜建超
baa126f16f fix 2020-12-08 17:29:43 +08:00
wulin
eced4b0bfa 修改数据库字段名称 2020-12-08 14:45:44 +08:00
wulin
bf9391b30a 提交关于暂存问题的解决 2020-12-08 14:26:31 +08:00
wulin
4a1674ec8a 提交测试 2020-12-08 14:16:22 +08:00
wulin
73dc741b51 提交测试 2020-12-08 13:40:20 +08:00
wulin
0361e33847 解决 2020-12-08 13:23:41 +08:00
杜建超
a6d59d1345 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-08 11:30:37 +08:00
杜建超
bbc232fa48 fix 2020-12-08 11:30:31 +08:00
wulin
1d99821249 去掉维度条数限制 2020-12-08 11:28:44 +08:00
wulin
6a25ce407c 修改制定目标时可能的错误内容 2020-12-08 10:52:49 +08:00
wulin
974fac214b Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-08 10:34:20 +08:00