Merge branch 'hotfix/log' into dev

master
zhanglingsheng 5 years ago
commit ac0132575f

@ -1636,7 +1636,7 @@ class DownloadController extends BaseController {
$nowTime = date('Y-m-d'); $nowTime = date('Y-m-d');
$begtime1 = date('Y-m-d', strtotime('-6 day', strtotime($nowTime))); $begtime1 = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
$endtime1 = $nowTime; $endtime1 = $nowTime;
$map["apply_time"] = ["between",[strtotime($begtime1),strtotime($endtime1)]]; $map["apply_time"] = ["between",[strtotime($begtime1),strtotime($endtime1) + 3600*24]];
} }
if(!empty($begtime) && !empty($endtime)) { if(!empty($begtime) && !empty($endtime)) {
$map["apply_time"] = ["between",[strtotime($begtime),strtotime($endtime) + 3600 * 24]]; $map["apply_time"] = ["between",[strtotime($begtime),strtotime($endtime) + 3600 * 24]];

Loading…
Cancel
Save