Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-23 41fa9a0f2f5cd0ffc9bd96e11f00245ea3567b9b

 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 {