合并代码，解决冲突

zhangchao

2024-11-02 f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae

 src/main/webapp/views/pdaResource/pdaResource.html

@@ -292,7 +292,7 @@
                    ids = obj.ids;
                }
                $.ajax({
                    url: baseUrl+"/resource/delete/auth",
                    url: baseUrl+"/pdaResource/delete/auth",
                    headers: {'token': localStorage.getItem('token')},
                    data: {ids: ids},
                    method: 'POST',