分支合并

src/web/staticres/js/ent-search-index-pc.js

@@ -302,7 +302,10 @@ var entSearch = new Vue({
         getBIParams () {
           const urlParams = new URLSearchParams(window.location.search)
           return urlParams.get('resource')
+<<<<<<< HEAD
 
+=======
+>>>>>>> feature/v4.8.75
         }
     },
     created: function () {