From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/resources/templates/views/admin/index.html | 6 ++++--
1 files changed, 4 insertions(+), 2 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 f3bb64a..1e6217d 100644
--- a/zq-erp/src/main/resources/templates/views/admin/index.html
+++ b/zq-erp/src/main/resources/templates/views/admin/index.html
@@ -85,11 +85,13 @@
</div>
<div class=" hidden-xs">
<div style="text-align:right;font-size: 14px; " >
-
<span style="line-height: 35px; display: inline-block; " th:utext="${session.userInfo.shopName}+' | '"></span>
<i class="fa fa-user" ></i>
- <span style="line-height: 35px; color: #333; " th:utext="${session.userInfo.suName}">
+ <span style="line-height: 35px; color: #333; " th:utext="${session.userInfo.suName}+' | '">
</span>
+ <a style="line-height: 35px; color: #333; " target="_blank" href="https://www.yuque.com/books/share/7b10c3aa-f289-4f36-b402-5031fbd7f038" >
+ <i class="fa fa-book" aria-hidden="true"></i>
+ 帮助手册</a>
</div>
</div>
--
Gitblit v1.9.1