我改变了锻炼页面的其他文章排版
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'