课题部分功能实现
Signed-off-by: gitlibing <735118485@qq.com>
Signed-off-by: gitlibing <735118485@qq.com>
Merge branch 'master' of https://github.com/chase30/lw_hg.git

Conflicts:
	WebRoot/WEB-INF/classes/spring-mvc.xml
	WebRoot/WEB-INF/classes/sysConfig.properties