Merge branch 'Haozi'

# Conflicts:
#	app/Http/Controllers/TestController.php

app/Http/Controllers/CommodityController.php

@@ -100,7 +100,7 @@ class CommodityController extends Controller
     {
         if(!Gate::allows('商品信息-编辑')){ return redirect(url('denied'));  }
         $ownerService=app(OwnerService::class);
-
+        $owners = $ownerService->getIntersectPermitting();
         return view('maintenance.commodity.edit',['commodity'=>$commodity,'owners'=>$owners]);
     }