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

whycq

2022-08-06 f41349d180a4c42a3a127c9fbd102fe4603890fb

 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 {