合并代码，解决冲突

zhangchao

2024-11-02 f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae

 src/main/webapp/static/js/agvHandWrkMast/agvHandWrkMast.js

@@ -148,7 +148,7 @@
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    shadeClose: true,
                    content: 'wrkDetlLog.html',
                    content: 'wrkLog.html',
                    success: function(layero, index){
                    }
                });