From b6addbdc96eb4fba4c7b3a295ed9d47020f74ceb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 14:19:54 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/resources/templates/views/admin/index.html | 4 ----
1 files changed, 0 insertions(+), 4 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..96a5815 100644
--- a/zq-erp/src/main/resources/templates/views/admin/index.html
+++ b/zq-erp/src/main/resources/templates/views/admin/index.html
@@ -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