合并分支 'akun' 到 'master'
Akun 查看合并请求 !3075
正在显示
1 个修改的文件
包含
1 行增加
和
1 行删除
| @@ -32,7 +32,7 @@ class InquiryForwardController extends BaseController | @@ -32,7 +32,7 @@ class InquiryForwardController extends BaseController | ||
| 32 | $this->map['message'] = ['like', '%' . $this->map['message'] . '%']; | 32 | $this->map['message'] = ['like', '%' . $this->map['message'] . '%']; |
| 33 | } | 33 | } |
| 34 | if (isset($this->param['start_date']) && isset($this->param['end_date'])) { | 34 | if (isset($this->param['start_date']) && isset($this->param['end_date'])) { |
| 35 | - $this->map['inquiry_date'] = ['between', [$this->map['start_date'] . ' 00:00:00', $this->map['end_date'] . ' 00:00:00']]; | 35 | + $this->map['inquiry_date'] = ['between', [$this->map['start_date'] . ' 00:00:00', $this->map['end_date'] . ' 23:59:59']]; |
| 36 | unset($this->map['start_date']); | 36 | unset($this->map['start_date']); |
| 37 | unset($this->map['end_date']); | 37 | unset($this->map['end_date']); |
| 38 | } elseif (isset($this->param['start_date'])) { | 38 | } elseif (isset($this->param['start_date'])) { |
-
请 注册 或 登录 后发表评论