Merge branch 'circle' into develop

app/Http/Controllers/ConfigController.php

@@ -101,6 +101,7 @@ class ConfigController extends Controller
                 '2' =>'用户',
                 '3' =>'活动',
                 '4' =>'话题',
+                '5' =>'社团活动',
             ],
             'floor_type'=>[
                 0=>'banner',