From 05a82deffa89a22fa35abaa9196053f43cbc1103 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:51:07 +0800
Subject: [PATCH] fix

---
 zq-erp/src/main/resources/templates/views/admin/index.html |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/index.html b/zq-erp/src/main/resources/templates/views/admin/index.html
index 6d15706..c6f48a8 100644
--- a/zq-erp/src/main/resources/templates/views/admin/index.html
+++ b/zq-erp/src/main/resources/templates/views/admin/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="renderer" content="webkit">
     <meta http-equiv="Cache-Control" content="no-siteapp"/>
-    <title>阿尔法云管理系统</title>
+    <title></title>
     <!-- 本框架基本脚本和样式 -->
     <link rel="stylesheet" type="text/css" th:href="@{/plugin/layer/skin/layer.css}">
     <script type="text/javascript"
@@ -37,11 +37,7 @@
                         <a id="dLabel" data-toggle="dropdown" class="dropdown-toggle" href="#" aria-haspopup="true" aria-expanded="true">
 								<span class="clear" style="height: auto;">
 									<span class="block m-t-xs">
-<<<<<<< HEAD
-										<strong class="font-bold">阿尔法云管理系统</strong>
-=======
 										<strong class="font-bold">{{systemName}}</strong>
->>>>>>> feature/订单服务单代码改造
 									</span>
 							</span>
                         </a>

--
Gitblit v1.9.1