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

fengxiang

2018-03-16 bd1966ac64e93a610a4635c3eefd5115ab825c5b

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

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