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/sensors/basic-info/sensor-edit/sensor-edit.component.ts | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/routes/sensors/basic-info/sensor-edit/sensor-edit.component.ts b/src/app/routes/sensors/basic-info/sensor-edit/sensor-edit.component.ts
index 4d06e27..1d644a1 100644
--- a/src/app/routes/sensors/basic-info/sensor-edit/sensor-edit.component.ts
+++ b/src/app/routes/sensors/basic-info/sensor-edit/sensor-edit.component.ts
@@ -23,7 +23,7 @@
const data = this.data;
const validates: Sensor = {
name: [data.name, [Validators.required] ],
- key: [data.key, [Validators.required] ],
+ sensorKey: [data.sensorKey, [Validators.required] ],
lower: [data.lower ],
upper: [data.upper ],
unit: [data.unit ],
--
Gitblit v1.8.0