4.22早上修改  liu
4.22早上  liu
Merge branch 'master' of github.com:liusongWtu/WtuThesisPlatform

Conflicts:
	WtuThesisPlatform/WtuThesisPlatform.suo