From b146837ead8788c6f727256eca69df85c23ce218 Mon Sep 17 00:00:00 2001
From: wlf <920607690@qq.com>
Date: Sun, 13 Jan 2019 00:43:32 +0800
Subject: [PATCH] Merge branch 'master' of
 https://bdgit.educoder.net/zhailw/gdms into wlf

# Conflicts:
#	GDMS.iml
#	src/servlet/account/login.java
---
 src/servlet/basic_settings/S_Filter.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/servlet/basic_settings/S_Filter.java b/src/servlet/basic_settings/S_Filter.java
index 56d7fbe..1eccfd1 100644
--- a/src/servlet/basic_settings/S_Filter.java
+++ b/src/servlet/basic_settings/S_Filter.java
@@ -10,7 +10,6 @@ import java.io.IOException;
 public class S_Filter implements Filter {
     String NO_LOGIN="/notLogin";
     String includeUrls="/gdms/login.jsp";
-    @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws ServletException,IOException{
         HttpServletRequest request=(HttpServletRequest) servletRequest;
         HttpServletResponse response=(HttpServletResponse) servletResponse;