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

app/Repositories/FeedRepositories.php

@@ -90,6 +90,7 @@ class FeedRepositories
                 }elseif ($feedType==4){//评论
                     $data['relate_id'] = $request['post_id'];
                     $content['post_desc'] = $request['post_desc'];
+                    $content['comment_id'] = $request['comment_id'];
                     $content['comment_desc'] = $request['comment_content'];
                     $content['beans'] = isset($request['rewards']['bean'])?intval($request['rewards']['bean']):0;
                     $content['post_type'] = $request['post_type'];