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

app/admin/controller/Resign.php

@@ -30,7 +30,7 @@ class Resign extends Base
         $good_code = isset($this->post['good_code']) && $this->post['good_code']!="" ? trim($this->post['good_code']):"";
         if($good_code!=""){
            // $where['p.good_code'] = $good_code;
-            $where[]=['p.good_code',"like","%{$good_code}%"];
+            $where[]=['p.spuCode',"like","%{$good_code}%"];
         }
 
         $good_type_code = isset($this->post['good_type_code']) && $this->post['good_type_code']!="" ? trim($this->post['good_type_code']):"";