Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-08-12 a332264920c9cd9226d566c19e36e5d5b5549c1b

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