From 0f54f5f9f792aabad6deea6209ed0d0d29e21bf8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 20 Dec 2021 11:47:44 +0800
Subject: [PATCH] 获取当前组织下设备列表及其详细信息

---
 screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 0691274..03a4812 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -348,9 +348,11 @@
         //������������
         deviceInfo.put("extend", device.getExtend());
 
+        //������������������
+        deviceInfo.put("town", device.getTown());
+
         //������
-        deviceInfo.put("profession", device.getProfession());
-        deviceInfo.put("professionName", device.getProfessionName());
+        deviceInfo.put("professions", device.getProfessions());
 
         //������
         deviceInfo.put("tech", device.getTech());

--
Gitblit v1.8.0