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

app/admin/controller/Good.php

@@ -74,7 +74,7 @@ class Good extends Base
         $good_type = isset($this->post['good_type']) && $this->post['good_type'] !=="" ? intval($this->post['good_type'])
             :"";
         if($good_type!==""){
-            $where[]=['good_type',"=",$good_type];
+            $where[]=['a.good_type',"=",$good_type];
         }
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !=="" ? trim($this->post['supplierNo'])
             :"";
@@ -132,7 +132,8 @@ class Good extends Base
             ->where($where)
             ->page($page,$size)
             ->order("b.addtime desc")
-            ->select();
+            ->select()
+            ->toArray();
         $data=[];
         foreach ($list as $value){
             $value['cat_info']= made($value['cat_id'],[]);