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

zwl

2023-10-07 af17595ea094b162d3b90279f140cbdb3da1c52b

 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 {