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

ZhuDongming

2020-01-09 5fcdc8ba338a9f8730262970547274b0dcfe6b4d

 src/main/webapp/js/moralmap.js

@@ -861,6 +861,9 @@
                            for (var key in sensorsUnitMap) {
                                if (prop == key) {
                                    var sensorsUnit = sensorsUnitMap[key];
                                    if(sensorsUnit==null){
                                        sensorsUnit="";
                                    }
                                }
                            }
                            adressOutHtml += ('<p style="height: 18px;line-height: 18px">' + sensorsDescription + "：" + jsonData[prop] + sensorsUnit + "</p>");