改好了图片鼠标在上面显示进入
Merge branch 'refs/heads/master' into kontem
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Train/index.html
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Public/footer.html
	aijianmei_back/apps/index/Tpl/default/Train/index.html
Merge remote-tracking branch 'refs/remotes/origin/master'
首页滚轮效果fix
Merge branch 'refs/heads/kontem'
Merge remote-tracking branch 'refs/remotes/origin/master'
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Public/footer.html