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/static/image/log.png | 0
src/main/webapp/views/index.html | 3 ++-
src/main/webapp/views/login.html | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/static/image/log.png b/src/main/webapp/static/image/log.png
new file mode 100644
index 0000000..37bd36c
--- /dev/null
+++ b/src/main/webapp/static/image/log.png
Binary files differ
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index d654c1f..04042de 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -2,10 +2,11 @@
<html>
<head>
<meta charset="utf-8">
- <title>鑷姩浠撳偍绠＄悊绯荤粺</title>
+ <title>鑷姩浠撳偍 - 绠＄悊绯荤粺</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="icon" type="image/x-icon" href="../static/image/log.png" />
<link rel="stylesheet" href="../static/layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../static/layuiadmin/style/admin.css" media="all">
<style>
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