合并代码，解决冲突

zhangchao

2024-11-04 c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9

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

@@ -109,6 +109,7 @@
                        'wrkMast': exportData,
                        'fields': fields
                    };

                    $.ajax({
                        url: baseUrl+"/wrkMast/export/auth",
                        headers: {'token': localStorage.getItem('token')},
@@ -148,7 +149,7 @@
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    shadeClose: true,
                    content: 'wrkDetlLog.html',
                    content: 'wrkLog.html',
                    success: function(layero, index){
                    }
                });