Merge remote-tracking branch 'origin/develop' into develop

app/Providers/ProductServiceProvider.php

@@ -47,7 +47,7 @@ class ProductServiceProvider extends ServiceProvider
 						continue;
 					}
 					//如果已经有这个产品 滚蛋
-					if(AgentProductItem::query()->where(['product_id' => $product->supplier_id,'agent_id' => $v])->exists()){
+					if(AgentProductItem::query()->where(['product_id' => $product->id,'agent_id' => $v])->exists()){
 						continue;
 					}
 					//啥有没有 自动添加商品