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

Junjie

2023-05-26 ea5e88b0c6f5be4d0c6637b5e7bba94ee85f9673

 src/main/webapp/static/js/report/locMap.js

@@ -73,7 +73,7 @@
            maxmin: true,
            area: [top.detailWidth, top.detailHeight],
            shadeClose: true,
            content: 'locDetl.html',
            content: 'locDetlGroup.html',
            success: function(layero, index){
                locNo = value;
            }