Merge branch 'develop'

# Conflicts:
#	app/Repositories/FeedRepositories.php

app/Repositories/FeedRepositories.php

@@ -118,10 +118,10 @@ class FeedRepositories
                     //if (isset($request['is_existing']) && intval($request['is_existing']) == 0) {
                     //    $this->feed->insert($data);
                     //}
-                    $feedRow = $this->feed->where('uid', $fan)
-                        ->where('follow_uid', $request['target_id'])
-                        ->where('type', $feedType)
-                        ->where('relate_id', $request['post_id'])
+                    $feedRow = $this->feed->where('uid',$data['uid'])
+                        ->where('follow_uid',$data['follow_uid'])
+                        ->where('type',$data['type'])
+                        ->where('relate_id',$data['relate_id'])
                         ->first();
                     if (empty($feedRow)) {
                         $this->feed->insert($data);