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

mrzhssss

2022-12-14 2b7ac35fd8abeaec8dcda8ed731ed8007e9e08d4

 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 {