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

app/admin/controller/Log.php

@@ -115,7 +115,7 @@ class Log extends BaseController
         $count = Db::name("order_msg")->where($condition)->count();
         $total = ceil($count/$size);
         $page = $page >= $total ? $total : $page;
-        $list =Db::name("order_msg")->where($condition)->page($page,$size)->select();
+        $list =Db::name("order_msg")->where($condition)->page(intval($page),$size)->select();
         $data=[];
         $type = \think\facade\Config::get("order");
         foreach ($list as $value){