Merge branch 'jsxswms' into integrationWms

zhang

7 天以前 af7b9db27bf72c92108329815ec771fb46e5b877

 src/main/webapp/static/js/report/locMap.js

@@ -64,6 +64,7 @@
        || html.trim()==='S'
        || html.trim()==='D'
        || html.trim()==='O'
        || html.trim()==='Z'
    ){

    } else {