Merge branch 'test'

7d768240 · clone · 646e99ad · d4b86372 · 7d768240
Commit 7d768240 authored Jun 28, 2018 by clone
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Feed.php application/api_broker/controller/Feed.php +2 -2

No files found.
--- a/application/api_broker/controller/Feed.php
+++ b/application/api_broker/controller/Feed.php
@@ -30,9 +30,9 @@ class Feed extends Basic
        if (isset($this->params['home']) && $this->params['home'] == 1) {
            //首页
            $where_0['status'] = 0;
-            $where_0['type'] = 1;
+            $where_0['type'] = 0;
            $where_1['status'] = 0;
-            $where_1['type'] = 0;
+            $where_1['type'] = 1;
            $feed   = $push->getFeedInfo($field, $where_0, 'id desc');
            $notice = $push->getFeedInfo($field, $where_1, 'id desc');