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

fengxiang

2018-02-01 5562436e2898f5d013a2ccd7138d4dfe0888c5f5

 src/app/routes/devices/version/version-sensor-config/version-sensor-config.component.ts

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