改好了图片鼠标在上面显示进入
delete the 'meaning of train' frame
update sider's html
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Train/index.html
correct the sider logic
Merge branch 'refs/heads/master' into BB

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Append/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'
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
Merge branch 'refs/heads/kontem'
Merge remote-tracking branch 'refs/remotes/origin/master'
Changed the style of shop.
Merge remote-tracking branch 'refs/remotes/origin/AnnBranch'
诡异底部
what
change some place
what
我上传了一个BIG GUY