导师 挂靠的学院  信息维护

Signed-off-by: allen <415522571@qq.com>
Merge remote-tracking branch 'remotes/michael/master'

Conflicts:
	src/main/resources/applicationContext-actions.xml
	src/main/resources/applicationContext-domain.xml
Merge pull request #49 from allenwtl/master

导师挂靠 学院信息  维护