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

沈斌

2018-02-28 e86e4f95fcca349107237f8f4161b9c91e279af1

 src/app/routes/devices/basic-info/basic-info.component.html

@@ -1,6 +1,6 @@
<div class="content__title">
    <h1>
        设备列表
        设备配置
        <small>包含设备的查询、编辑、删除、配置等功能</small>
    </h1>
</div>