From 28b17e7a9b0bd3a8ed545aff4f077fe981db85d2 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 04 Jul 2018 17:13:06 +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