Merge remote-tracking branch 'remotes/origin/master' into wmj

# Conflicts:
#	src/core/process/Process.java
#	src/core/process/ProcessManagement.java

src/core/operation/Search.json

@@ -1,7 +1,7 @@
 {
   "options":{
     "table": "String",
-    "fields": "List",
+    "fields": "List<String>",
     "value": "String",
     "start": "int",
     "end": "int"

src/core/process/C_StudentSearchTeacher.java

@@ -0,0 +1,28 @@
+package core.process;
+
+
+
+import core.operation.Operation;
+import core.operation.Search;
+import core.user.User;
+
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class C_StudentSearchTeacher {
+    Map<String,String> TeacherInfo=new HashMap<String, String>();
+    public Map<String,String> search(String TeacherID){
+        Search search  = new Search() ;
+        search.setOptions(new HashMap<>());
+        String table = "teacher";
+        search.addOptions("table",table);
+        List<String> fields = new ArrayList<>();
+        fields.add("*");
+        search.addOptions("field",fields);
+        return TeacherInfo;
+    }
+
+}