Merge branch 'master' into release

app/Transformers/Circle/DetailTransformer.php

@@ -82,7 +82,7 @@ class DetailTransformer extends TransformerAbstract
             }
             if ('chatroom' == $func['function']) {
                 if (1 == $func['is_open']) {
-                    $info['chatroom'] = ['is_open' => 1, 'extra' => (string)$interestCircle['relate_id']];
+                    $info['chatroom'] = ['is_open' => 1, 'extra' => (string)$func['relate_id']];
                 }
             }
         }