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

src/core/process/C_StudentSelectTeacher.java

@@ -7,7 +7,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class C_StudentSelectTeacher extends Process {
+public class C_StudentSelectTeacher extends core.process.Process {
     public void select(String studentID,String teacherID)throws Exception{
         Select select=new Select();
         select.setOptions(new HashMap<>());

src/core/process/ProcessManagement.java

@@ -29,7 +29,9 @@ public class ProcessManagement {
 
     //Map<graduation_design_id.x_status,status>
     public static Map<String,Character> getStatus(User user){
+
         Map<String,String> userTables = DBManagement.getUserTables(user.getType());
+        String graduationDesignId = null;
         for(Map.Entry<String,String> entry:userTables.entrySet()){
             String[] ti = entry.getKey().split(".");
             String[] ts = entry.getValue().split(".");

src/filter/S_Filter.java

@@ -1,4 +1,4 @@
-package servlet.basic_settings;
+package filter;
 
 import javax.servlet.*;
 import javax.servlet.annotation.WebFilter;

src/gdms/Mode.java

@@ -1,6 +1,6 @@
 package gdms;
 
 public interface Mode {
-    public static int strict = 1;
+    public static int strict = 0;
     public static int debug = 1;
 }

src/gdms/test.java

@@ -1,6 +1,7 @@
 package gdms;
 
 import core.operation.utils.Utils;
+import core.process.C_StudentSelectTeacher;
 import dao.Select;
 
 import java.util.ArrayList;
@@ -10,6 +11,14 @@ import java.util.Map;
 
 public class test {
     public static void main(String[] args){
+        String student_id = "001";
+        String teacher_id = "002";
+        core.process.Process p = new C_StudentSelectTeacher();
+        try {
+            ((C_StudentSelectTeacher) p).select(student_id,teacher_id);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         List<String> list = new ArrayList<>();
         list.add("q");
         list.add("w");