Signed-off-by: GuoSongHao <1005519278@qq.com>
Signed-off-by: GuoSongHao <1005519278@qq.com>
Merge branch 'master' of https://github.com/guosonghao/Home

Conflicts:
	JFPlatform/Login.aspx
	JFPlatform/WebForm1.aspx