Merge branch 'test'

application/api_broker/controller/HomePageLog.php

@@ -114,9 +114,9 @@ class HomePageLog extends Basic
 
         $date = date("Y-m-d", time());
         if ($start_time >= $date && $start_time <= $date . " 23:59:59" ) {
-            $result = $this->phoneFollowUpTemporary->getFollowList($pageNo, $pageSize, $order_ = '', $field, $where_);
+            $result = $this->phoneFollowUpTemporary->getFollowList($pageNo, $pageSize, $order_ = 'id desc', $field, $where_);
         } else {
-            $result = $this->uPhoneFollowUpModel->getFollowList($pageNo, $pageSize, 'id desc',$field, $where);
+            $result = $this->uPhoneFollowUpModel->getFollowList($pageNo, $pageSize, '',$field, $where);
         }
         $clientService = new ClientService();
         $m_label = new ULabels();