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

pang.jiabao

2024-11-10 25fcfa12ceae7dac621b3a5ac671d515167cb23a

 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 {