From c4e5462dfcd091089402ed91c445213d3fb18aae Mon Sep 17 00:00:00 2001
From: wlf <920607690@qq.com>
Date: Sun, 13 Jan 2019 14:39:49 +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/{ => select}/S_TeacherSelectStudent.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/servlet/{ => select}/S_TeacherSelectStudent.java (97%)

diff --git a/src/servlet/S_TeacherSelectStudent.java b/src/servlet/select/S_TeacherSelectStudent.java
similarity index 97%
rename from src/servlet/S_TeacherSelectStudent.java
rename to src/servlet/select/S_TeacherSelectStudent.java
index 1ebed38..bcf2b4b 100644
--- a/src/servlet/S_TeacherSelectStudent.java
+++ b/src/servlet/select/S_TeacherSelectStudent.java
@@ -1,4 +1,4 @@
-package servlet;
+package servlet.select;
 
 import core.process.C_TeacherSelectStudent;
 import core.user.User;