Pārlūkot izejas kodu

Merge branch 'feature/v4.8.70' of https://jygit.jydev.jianyu360.cn/qmx/jy into feature/v4.8.70

123456 1 gadu atpakaļ
vecāks
revīzija
a54e172a3c
1 mainītis faili ar 3 papildinājumiem un 0 dzēšanām
  1. 3 0
      src/web/staticres/js/ent-search-index-pc.js

+ 3 - 0
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 () {