Merge branch 'master-dev' of wugg/cxinv into master

app/admin/controller/InvCat.php

@@ -101,7 +101,7 @@ class InvCat extends BaseController{
         $count=Db::name("good")->where($condition)->count();
         $total=ceil($count/$size);
         $page = $page>=$total? intval($total):$page;
-        $list =Db::name("good")->where($condition)->order("addtime desc")->page($page,$size)->select()->toArray();
+        $list =Db::name("good")->where($condition)->order("id desc")->page($page,$size)->select()->toArray();
         foreach ($list as &$value){
             $company =Db::name("supplier_info")->where(["code"=>$value['companyNo']])->find();
             $value['companyName']=$company['name']??"";
@@ -143,7 +143,7 @@ class InvCat extends BaseController{
         $count =Db::name("inv_cat")->where($condition)->count();
         $total=ceil($count/$size);
         $page = $page>=$total? intval($total):$page;
-        $list =Db::name("inv_cat")->where($condition)->order("addtime desc")->page($page,$size)->select()->toArray();
+        $list =Db::name("inv_cat")->where($condition)->order("id desc")->page($page,$size)->select()->toArray();
         foreach ($list as &$value){
             $value['tax'] = $value['tax']==''?[]:explode("、",$value['tax']);
         }

app/command/Report.php

@@ -500,7 +500,7 @@ class Report extends Command
 
 		$where = [['a.is_del', '=', 0], ['a.status', '>=', 4]];
 
-		if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.addtime', 'between', [$param['start'], $param['end']]];
+		if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['c.open_date', 'between', [$param['start'],$param['end']]];
 		if ($param['companyNo'] != '') $where[] = ['a.inv_out', '=', $param['companyNo']];
 
 		$data = Db::name('invoice_pool')