Merge remote-tracking branch 'origin/develop' into develop

app/Repositories/FeedRepositories.php

@@ -82,8 +82,10 @@ class FeedRepositories
                     $content['comment_desc'] = $request['comment_content'];
                 }elseif ($feedType==6){//发布
                     $data['relate_id'] = $request['post_id'];
+                    $content['post_desc'] = $request['post_desc'];
                 }elseif ($feedType==5){//关注
                     $data['relate_id'] = $request['focus_uid'];
+                    $content = "";
                 }
                 $data['content'] = json_encode($content);
                 $data['created_at'] = Carbon::now();