Skip to content

T
tl_estate
Commit bbc4053c authored by hujun's avatar hujun
Browse files
Options

Merge branch 'test'

parents 9d11c8da 6798f64e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
application/api_broker/controller/HomePageLog.php
View file @ bbc4053c
...@@ -114,9 +114,9 @@ class HomePageLog extends Basic ...@@ -114,9 +114,9 @@ class HomePageLog extends Basic
$date = date("Y-m-d", time()); $date = date("Y-m-d", time());
if ($start_time >= $date && $start_time <= $date . " 23:59:59" ) { 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 { } else {
$result = $this->uPhoneFollowUpModel->getFollowList($pageNo, $pageSize, 'id desc',$field, $where); $result = $this->uPhoneFollowUpModel->getFollowList($pageNo, $pageSize, '',$field, $where);
} }
$clientService = new ClientService(); $clientService = new ClientService();
$m_label = new ULabels(); $m_label = new ULabels();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment