日常更新
更新：课程库和先修关系部分
暂时删除classes

Signed-off-by: michael--- <1572110873@qq.com>
无

Signed-off-by: michael--- <1572110873@qq.com>
Merge branch 'master' into wh-dev

Conflicts:
	course/build/classes/com/course/action/RelationAction.class
	course/build/classes/com/course/action/SubtypeAction.class
	course/build/classes/com/course/dao/ISubtypeDao.class
	course/build/classes/com/course/dao/impl/CourseapplyDaoImp.class
	course/build/classes/com/course/dao/impl/SubtypeDaoImp.class
	course/build/classes/com/course/dao/impl/SubtypemoduleDaoImp.class
	course/build/classes/com/course/entity/Course.hbm.xml
	course/build/classes/com/course/entity/Courseapply.hbm.xml
	course/build/classes/com/course/entity/Coursetype.hbm.xml
	course/build/classes/com/course/entity/PreCourse.hbm.xml
	course/build/classes/com/course/entity/Relation.hbm.xml
	course/build/classes/com/course/entity/Subtype.hbm.xml
	course/build/classes/com/course/entity/Subtypemodule.class
	course/build/classes/com/course/entity/Subtypemodule.hbm.xml
	course/build/classes/com/course/entity/User.hbm.xml
	course/build/classes/com/course/service/ISubtypeManage.class
	course/build/classes/com/course/service/impl/SubtypeManageImp.class
	course/build/classes/com/course/service/impl/SubtypemoduleManageImp.class
	course/build/classes/com/test/CourseapplyActionTest.class
	course/build/classes/com/test/RelationActionTest.class
	course/build/classes/com/test/SubtypeActionTest.class
	course/build/classes/config/applicationContext-common.xml
	course/build/classes/config/struts-course.xml
	course/build/classes/config/struts-precourse.xml
	course/build/classes/config/struts-relation.xml

Signed-off-by: michael--- <1572110873@qq.com>