store
store register
Merge branch 'refs/heads/Annbranch'
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	aijianmei_front/article.html
	aijianmei_front/js/public.js
调整分类显示等
调整分类显示等
what
调整分类显示等
Merge remote-tracking branch 'refs/remotes/origin/master'
后台二级页面显示修改
我添加了二维码，调整了一下内容布局
what
重新调整了一下二维码的地方，加了一点介绍内容