feat: 合并冲突

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

@@ -296,14 +296,12 @@ var entSearch = new Vue({
                 }
             }
         },
-<<<<<<< HEAD
         company_phone_show :function (){
             return  this.isLogin && !this.isFree
-=======
+        },
         getBIParams () {
           const urlParams = new URLSearchParams(window.location.search)
           return urlParams.get('resource')
->>>>>>> master
         }
     },
     created: function () {