wugg 2 years ago
parent
commit
49b645f1b1
2 changed files with 1 additions and 1 deletions
  1. 0 1
      app/admin/controller/Purch.php
  2. 1 0
      app/admin/controller/Sale.php

+ 0 - 1
app/admin/controller/Purch.php

@@ -638,7 +638,6 @@ class Purch extends Base
                 $order = ["order_code" => $vlue, "status" => '', "action_remark" => $remark, "action_type" => "status"];
                 ActionLog::logAdd($this->post['token'], $order, 'CGD', $status, $this->post);
             }
-
             return app_show(0, "更新成功");
         } else {
             return error_show(1004, '更新失败');

+ 1 - 0
app/admin/controller/Sale.php

@@ -1935,6 +1935,7 @@ class Sale extends Base
         }
         $end = isset($this->post['end']) && $this->post['end'] !== "" ? $this->post['end'] : "";
         if ($end != "") {
+            $end.=" 23:59:59";
             $where[] = ["s.addtime", '<=', $end];
         }
         $role=$this->checkRole();