轮播图bug
little
Merge branch 'develop' of https://github.com/STUKA-TEAM/ZhongheWeiHelperR2 into develop
Merge branch 'develop' of https://github.com/STUKA-TEAM/ZhongheWeiHelperR2 into develop
delete
Merge branch 'develop' of https://github.com/STUKA-TEAM/ZhongheWeiHelperR2 into develop
Merge branch 'develop' of https://github.com/STUKA-TEAM/ZhongheWeiHelperR2 into develop
Merge branch 'develop' of https://github.com/STUKA-TEAM/ZhongheWeiHelperR2 into develop

Conflicts:
	WebContent/WEB-INF/CustomerViews/WebsiteViews/website-1.jsp
	WebContent/wei-website-8.html
Merge branch 'develop' of https://github.com/STUKA-TEAM/ZhongheWeiHelperR2 into develop
分店后台完成
Merge branch 'develop' of https://github.com/STUKA-TEAM/ZhongheWeiHelperR2 into develop
little
Merge branch 'develop' of https://github.com/STUKA-TEAM/ZhongheWeiHelperR2 into develop
完成中奖情况查看