Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/controller/Good.php

@@ -1112,7 +1112,7 @@ class Good extends Base
 //            $value['cat_id']=isset($godd['cat_id'])? $godd['cat_id']:"";
 //            $value['is_stock']=isset($godd['is_stock'])? $godd['is_stock']:"";
             $int = isset($value['cat_id']) && $value['cat_id'] != 0 ? made($value['cat_id']) : [];
-            $value['wsm_name'] =$wsmcode[$value['wsm_code']];
+            $value['wsm_name'] =$wsmcode[$value['wsm_code']]??"";
 //            $value['wsm_code'] =$wsm['wsm_code'];
 //            $value['code'] =$wsm['code'];
 //            $value['name'] =$wsm['name'];