From e86e4f95fcca349107237f8f4161b9c91e279af1 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 28 Feb 2018 11:16:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/app/routes/sensors/basic-info/sensor-edit/sensor-edit.component.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/routes/sensors/basic-info/sensor-edit/sensor-edit.component.html b/src/app/routes/sensors/basic-info/sensor-edit/sensor-edit.component.html
index 0147609..e401333 100644
--- a/src/app/routes/sensors/basic-info/sensor-edit/sensor-edit.component.html
+++ b/src/app/routes/sensors/basic-info/sensor-edit/sensor-edit.component.html
@@ -16,7 +16,7 @@
<label nz-form-item-required>������</label>
</div>
<div nz-form-control nz-col [nzSpan]="5" nzHasFeedback>
- <nz-input formControlName="key" maxlength="20" [nzPlaceHolder]="'������'">
+ <nz-input formControlName="sensorKey" maxlength="20" [nzPlaceHolder]="'������'">
</nz-input>
</div>
<div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
--
Gitblit v1.8.0