Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

lty

3 天以前 84edd2b6308fa018eab932a2db528b7e6e1e6d13

 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 {