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

沈斌

2018-02-02 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90

 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'
      },