作者 刘锟

合并分支 'akun' 到 'master'

Akun



查看合并请求 !3075
... ... @@ -32,7 +32,7 @@ class InquiryForwardController extends BaseController
$this->map['message'] = ['like', '%' . $this->map['message'] . '%'];
}
if (isset($this->param['start_date']) && isset($this->param['end_date'])) {
$this->map['inquiry_date'] = ['between', [$this->map['start_date'] . ' 00:00:00', $this->map['end_date'] . ' 00:00:00']];
$this->map['inquiry_date'] = ['between', [$this->map['start_date'] . ' 00:00:00', $this->map['end_date'] . ' 23:59:59']];
unset($this->map['start_date']);
unset($this->map['end_date']);
} elseif (isset($this->param['start_date'])) {
... ...