合并所有分支，查找合并错误

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="false" project-jdk-name="10" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

src/core/user/Administrator.java

@@ -3,6 +3,11 @@ package core.user;
 import java.util.Map;
 
 public class Administrator extends User {
+    @Override
+    public String getType() {
+        return "administrator";
+    }
+
     @Override
     public void setAttr(Map<String, String> vMap){
         super.setAttr(vMap);

src/servlet/basic_settings/S_Filter.java

@@ -10,6 +10,12 @@ import java.io.IOException;
 public class S_Filter implements Filter {
     String NO_LOGIN="/notLogin";
     String includeUrls="/gdms/login.jsp";
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+
+    }
+
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws ServletException,IOException{
         HttpServletRequest request=(HttpServletRequest) servletRequest;
         HttpServletResponse response=(HttpServletResponse) servletResponse;
@@ -39,6 +45,12 @@ public class S_Filter implements Filter {
 
 
     }
+
+    @Override
+    public void destroy() {
+
+    }
+
     public boolean isNeedFilter(String uri) {
             if (includeUrls.equals(uri)) {
                 return false;

web/login.jsp

@@ -56,7 +56,7 @@
             <select class="id-check" name="usertype">
                 <option value="">身份</option>
                 <option value="student">学生</option>
-                <option v   alue="teacher">老师</option>
+                <option value="teacher">老师</option>
             </select>
             <input class="register-submit-style" type="submit" value="注册">
         </form>