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

app/admin/controller/Good.php

@@ -519,6 +519,8 @@ class Good extends Base
                     $item_good['specinfo'] = $speclist;
                     $item_good['unit'] = $good_unit_s[$item_good['good_unit']]??'';
                     $item_good['brand_name'] = $brands[$item_good['brand_id']]??'';
+                    $item_good['can'] = made($item_good['cat_id'],[]);
+
                 }