Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf

# Conflicts:
#	GDMS.iml
#	src/servlet/account/login.java

src/servlet/select/S_StudentSelectTeacher.java

@@ -0,0 +1,24 @@
+package servlet.select;
+
+import core.process.C_StudentSearchTeacher;
+import core.process.C_StudentSelectTeacher;
+import core.user.User;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class S_StudentSelectTeacher extends HttpServlet {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        super.doPost(request, response);
+        String student_id=request.getParameter("id");
+        User user=(User)request.getSession().getAttribute("User");
+        String teacher_id=user.getId();
+        try {
+            new C_StudentSelectTeacher().select(student_id,teacher_id);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}