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

czkh

昨天 975823f4d07c91a67162f553be9ff4ac25f3d47d

 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 {