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

app/admin/controller/Purch.php

@@ -66,7 +66,7 @@ class Purch extends Base
             :"";
         if($good_code!=""){
            // $where['good_code'] = Db::raw(" like %{$good_code}%");
-            $where[]=['good_code',"like", "%{$good_code}%"];
+            $where[]=['spuCode',"like", "%{$good_code}%"];
         }
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo']!="" ? trim($this->post['supplierNo'])
             :"";

app/admin/controller/Resign.php

@@ -743,7 +743,7 @@ class Resign extends BaseController
             "wsm_code"=>$wsm_code,
             "cgder"=>$supplier['person'],
             "cgder_id"=>$supplier['personid'],
-            "good_code"=>$info['spuCode'],
+            "spuCode"=>$info['spuCode'],
             "good_name"=>$info['good_name'],
             "good_num"=>$info['good_num'],
             "good_price"=>$goodnake['nake_total'],