From 87393cfec0e482f1d0c1d36196a4788b104df859 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 29 Mar 2018 10:45:03 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

---
 src/app/routes/devices/basic-info/basic-info.component.ts |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/devices/basic-info/basic-info.component.ts b/src/app/routes/devices/basic-info/basic-info.component.ts
index 5d9b915..abed486 100644
--- a/src/app/routes/devices/basic-info/basic-info.component.ts
+++ b/src/app/routes/devices/basic-info/basic-info.component.ts
@@ -175,6 +175,7 @@
               (staticComp) => {
                      const data: Device = {
                         id: record.id,
+                        mac: record.mac,
                         longitude: _data.longitude,
                         latitude: _data.latitude,
                      };
@@ -185,8 +186,7 @@
                           this.msgSrv.success('���������������������');
                         }
                       }
-                     );
-                     
+                     );                     
               }
            );
          }

--
Gitblit v1.8.0