From f320f1970e5d80a423f377fb3253628bd1e7f5bf Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 08 Mar 2018 15:10:46 +0800
Subject: [PATCH] Merge branch 'develop' of ssh://121.40.92.176:29418/screen-frontend into develop
---
src/app/routes/sensors/basic-info/basic-info.component.ts | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/routes/sensors/basic-info/basic-info.component.ts b/src/app/routes/sensors/basic-info/basic-info.component.ts
index e53d4f6..18ffc48 100644
--- a/src/app/routes/sensors/basic-info/basic-info.component.ts
+++ b/src/app/routes/sensors/basic-info/basic-info.component.ts
@@ -27,7 +27,7 @@
text: '������',
width: '200px'
},
- key: {
+ sensorKey: {
text: '������',
width: '60px'
},
--
Gitblit v1.8.0