fix conflict

alibaba · Jul 6, 2023 · d9d8567 · d9d8567
1 parent 36573ca
commit d9d8567
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/console/src/main/resources/static/index.html b/console/src/main/resources/static/index.html
@@ -35,7 +35,7 @@
 	<link rel="stylesheet" type="text/css" href="console-ui/public/css/icon.css">
 	<link rel="stylesheet" type="text/css" href="console-ui/public/css/font-awesome.css">
 	<!-- 第三方css结束 -->
-<link href="./css/main.css?fa5b9ed06cebf6d77a17" rel="stylesheet"></head>
+<link href="./css/main.css?17a33926721c99af1059" rel="stylesheet"></head>
 
 <body>
 	<div id="root" style="overflow:hidden"></div>
@@ -56,6 +56,6 @@
 	<script src="console-ui/public/js/merge.js"></script>
 	<script src="console-ui/public/js/loader.js"></script>
 	<!-- 第三方js结束 -->
-<script type="text/javascript" src="./js/main.js?fa5b9ed06cebf6d77a17"></script></body>
+<script type="text/javascript" src="./js/main.js?17a33926721c99af1059"></script></body>
 
 </html>
diff --git a/console/src/main/resources/static/js/main.js b/console/src/main/resources/static/js/main.js