From 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Dec 2020 14:08:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/controller/OrganizationSensorUnitController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/controller/OrganizationSensorUnitController.java b/src/main/java/com/moral/controller/OrganizationSensorUnitController.java
index 5158d46..12b5a97 100644
--- a/src/main/java/com/moral/controller/OrganizationSensorUnitController.java
+++ b/src/main/java/com/moral/controller/OrganizationSensorUnitController.java
@@ -44,7 +44,7 @@
             resultData.put("sensorUnitMap",sensorUnitMap);
         }else {
             resultData.put("osuList",new ArrayList<>()); // ���������������������
-            resultData.put("sensorUnitMap",new Object()); // ������������
+            resultData.put("sensorUnitMap",new HashMap<>()); // ������������
         }
         return new ResultBean(resultData);
     }

--
Gitblit v1.8.0