Merge remote-tracking branch 'origin/develop' into develop

沈斌

2018-03-13 9c9b8250b973eea72f6970e1ceb46facca9f0a99

 src/app/routes/analysis/query/query.component.less

@@ -10,7 +10,7 @@
        right: 0;
    }
}
.demo-chart {
.line-chart {
    height: 400px;
  }