Merge branch 'test'

application/api_broker/controller/Feed.php

@@ -36,15 +36,15 @@ class Feed extends Basic
             $feed   = $push->getFeedInfo($field, $where_0, 'id desc');
             $notice = $push->getFeedInfo($field, $where_1, 'id desc');
 
+            if ($notice) {
+                $data[] = $notice;
+            }
+
             if ($feed) {
                 $feed['content'] = '恭喜' . $feed['content'] . '成交'. $feed['house_title'] . '商铺一套';
                 $data[] = $feed;
             }
 
-            if ($notice) {
-                $data[] = $notice;
-            }
-
         } else {
             //列表页
             $pageNo   = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];