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

app/admin/controller/Allot.php

@@ -294,9 +294,10 @@ class Allot extends BaseController
                 $value['usable_num'] = $s['usable_stock'];
             }
             $value['error_msg']="";
+            $value['good_code']=$value['spuCode']=$value['good_type_code'];
             if($value['error_code']!=""){
                 $msg =Db::name("result_info")->where(['result_code'=>$value['error_code'],"is_del"=>0])->find();
-                $value['error_code_name']= isset($msg['result']) &&$msg['result']!="" ? $msg['result']:"";
+                $value['error_msg']=$value['error_code_name']= isset($msg['result']) &&$msg['result']!="" ? $msg['result']:"";
             }
             $data[]=$value;
         }