--no commit message

xiaomiao
Showing 1 changed file with 19 additions and 0 deletions
public/index.html
--- a/public/index.html
View file @45fb1e9
+++ b/public/index.html
View file @45fb1e9
 <!--
 * @Description: 
 * @Autor: renchao
+<<<<<<< HEAD
 * @LastEditTime: 2023-05-31 16:04:35
+=======
+<<<<<<< HEAD
+ * @LastEditTime: 2023-05-30 15:08:51
+=======
+ * @LastEditTime: 2023-05-26 16:57:47
+>>>>>>> origin/dev
+>>>>>>> bus
 -->
 <!DOCTYPE html>
 <html>
@@ -18,7 +26,14 @@
  </title>
 </head>
 <script>
+<<<<<<< HEAD
  window.baseUrl = location.origin || location.protocol + '//' + location.host
+=======
+<<<<<<< HEAD
+  window.baseUrl = location.origin || location.protocol + '//' + location.host
+  const authorization = "bearer ATT-7-TiYJVcoDnfhNGs160E6MbQ-QA9Ot3Tby"
+=======
+>>>>>>> bus
  window._config = {
    // 是否微服务模式，业务系统根据需要读取
    cloudEnable: false,
@@ -32,6 +47,10 @@
      business: 'http://localhost:7001'
    }
  }
+<<<<<<< HEAD
+=======
+>>>>>>> origin/dev
+>>>>>>> bus
  fetch('<%= BASE_URL %>config.json')
    .then(response => response.json())
    .then(config => {