From 42ac7e8242e0e6fa51816449f4d73f5e80114b9a Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Mar 2018 10:08:56 +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.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