From a1c7c8f01bc80853b0b591bbb1742e7be9c72f5c Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 20 Mar 2018 17:06:35 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend 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