From 17fa154079745b8291c0c492ea3560380bcdfc7a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 17 七月 2020 13:10:30 +0800
Subject: [PATCH] Merge branches 'master' and 'xtyasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xtyasrs

---
 src/main/webapp/views/login.html |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index ae22f7c..8bd6191 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -2,7 +2,8 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>绯荤粺鐧诲綍</title>
+    <title>鑷姩浠撳偍 - 绠$悊绯荤粺</title>
+    <link rel="icon" type="image/x-icon" href="../static/image/log.png" />
     <link rel="stylesheet" href="../static/layui/css/layui.css" media="all">
     <script type="text/javascript" src="../static/layui/layui.js"></script>
     <script type="text/javascript" src="../static/js/common.js"></script>

--
Gitblit v1.9.1