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

zhang

4 天以前 8f6ebf95e57c6f39ec11002de79bf6ed16844a5c

 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 {