烟台项目主分支
ss
Merge branch 'yt-dev' into yt

Conflicts:
	software/src/main/webapp/WEB-INF/jsps/index.jsp
显示会员最近中奖记录。
Merge branch 'yt-dev' of https://git.oschina.net/sylarlove/sdhuijin.git into yt-dev
Merge branch 'yt' into yt-dev

Conflicts:
	software/src/main/webapp/WEB-INF/jsps/index.jsp
	software/src/main/webapp/test.jsp
调整抽奖页面
Merge branch 'yt-dev' of https://git.oschina.net/sylarlove/sdhuijin.git into yt-dev