Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

 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);
    }