From bd91d5b5b7940ce46bc18ccc76f8bbafb167fbe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E6=A5=9A?= <823169880@qq.com>
Date: Sun, 13 Jan 2019 15:56:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/master' into
hechu1
# Conflicts:
# src/core/operation/Select.json
# src/core/process/Process.java
---
GDMS.iml | 18 ++++++++++++++++++
web/cssFile/home.css | 4 ++--
web/home.jsp | 15 +++++++++++++--
web/login.jsp | 2 +-
4 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/GDMS.iml b/GDMS.iml
index 9457690..7a04b38 100644
--- a/GDMS.iml
+++ b/GDMS.iml
@@ -29,5 +29,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web/cssFile/home.css b/web/cssFile/home.css
index 27b56c4..85e4dfd 100644
--- a/web/cssFile/home.css
+++ b/web/cssFile/home.css
@@ -207,7 +207,7 @@ width: 35px;
height: 900px;
}
.scroll-ads{
- height: 320px;
+ height: 250px;
width: 900px;
background-color: #ffffff;
position: absolute;
@@ -247,7 +247,7 @@ width: 35px;
}
.notice-frame{
background-color: white;
- margin:370px auto 0px 45px;
+ margin:300px auto 0px 45px;
position: relative;
width: 800px;
height: 400px;
diff --git a/web/home.jsp b/web/home.jsp
index 519c9f4..c87358d 100644
--- a/web/home.jsp
+++ b/web/home.jsp
@@ -9,16 +9,19 @@
毕业设计管理系统
+
+
+
@@ -54,7 +57,7 @@
+
diff --git a/web/login.jsp b/web/login.jsp
index 82983d5..4309303 100644
--- a/web/login.jsp
+++ b/web/login.jsp
@@ -53,7 +53,7 @@
placeholder="请输入电话">
- 
+