From 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 02 Feb 2018 11:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' 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