From 0fedf4949561e5eece7dc55c2dfc4963a5cbb6b2 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 15 May 2018 10:45:15 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

---
 src/app/routes/devices/version/version-sensor-config/version-sensor-config.component.ts |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/app/routes/devices/version/version-sensor-config/version-sensor-config.component.ts b/src/app/routes/devices/version/version-sensor-config/version-sensor-config.component.ts
index db44f3c..600dd37 100644
--- a/src/app/routes/devices/version/version-sensor-config/version-sensor-config.component.ts
+++ b/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'
       },

--
Gitblit v1.8.0