Merge branch 'dev/v4.8.70_wmh' of qmx/jy into feature/v4.8.70

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

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