Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

 src/main/webapp/js/moralmap.js

@@ -1063,6 +1063,7 @@
                }
            }
        }
        listView.refreshState(deviceStates);
        for (var i in states) {
            var state = states[i];
            var mpoint = moralMap.getMpoint(state.id);