Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-03-23 cb370be00fe6b23a8e13cbbd75c66bab9fed50c9

 src/app/routes/sensors/basic-info/basic-info.component.ts

@@ -27,7 +27,7 @@
        text: '名称',
        width: '200px'  
      },
      key: {
      sensorKey: {
        text: '键值',
        width: '60px'  
      },