展厅活动event页面数据库支持
Merge branch 'master' of https://github.com/zcbhaha/yanfenghupo

Conflicts:
	main/views.pyc