Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/admin/controller/Purch.php

@@ -642,7 +642,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, '更新失败');

app/admin/controller/Sale.php

@@ -1965,6 +1965,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();