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

app/Transformers/FeedTransformer.php

@@ -32,15 +32,9 @@ class FeedTransformer extends TransformerAbstract {
            // 'follow_status' => $this->getFollowStatus($feed['uid'],$feed['follow_uid']),
             'type' => $feed['type'],
             'relate_id' => $feed['relate_id'],
-            'relate_data' => $feed['relate_data'],
-            'content' => json_decode($feed['content']),
+            'relate_data' => !empty($feed['relate_data'])?$feed['relate_data']:'',
+            'content' => !empty($feed['content'])?json_decode($feed['content']):'',
             'created_at' => Carbon::parse($feed['created_at'])->diffForHumans(),
         ];
     }
-    public function getData($feed){
-//        if($feed['type'] == 6){
-//           return $this->detail($feed['relate_id']);
-//        }
-    }
-
 }