Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-10-22 f0b5148973e9437f3651153e53f8f336c4c3c6ff

 src/main/webapp/js/newmoralmap.js

@@ -1218,7 +1218,7 @@
        paramMap["states1"] = state1;
        $.ajax({
            url: "/screen/tellAlarm",
            type: "get",
            type: "post",
            dataType: "json",
            data: paramMap,
            success: function (info) {