Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms

zhangc

2025-04-18 a144c412981c49658c951db098a701a58f8e1ee3

 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 {