Merge branch 'plm' of wugg/stock into master

app/admin/controller/Resign.php

@@ -224,7 +224,7 @@ class Resign extends BaseController
             return error_show(1002,'未找到数据');
         }
         $goon = Db::name('good')->alias("a")->leftJoin("good_type b","a.good_code=b.good_code")->where
-        (['a.good_code'=>$data['good_code']])->field("cat_id,noble_metal")->find();
+        (['a.good_code'=>$info['good_code']])->field("cat_id,noble_metal")->find();
         if(empty($goon)){
             return error_show(1002,"未找到商品数据");
         }