Merge remote-tracking branch 'origin/master'

app/Models/AgentProduct.php

@@ -24,7 +24,7 @@ class AgentProduct extends BaseModel
 
 	public function agent()
 	{
-		return $this->belongsTo(Agent::class);
+		return $this->belongsTo(Agent::class)->withTrashed();
 	}
 
 	public function category()
@@ -39,7 +39,7 @@ class AgentProduct extends BaseModel
 
 	public function guide()
 	{
-		return $this->belongsTo(Guide::class);
+		return $this->belongsTo(Guide::class)->withTrashed();
 	}
 
 	public function item()

app/Models/AgentProductItem.php

@@ -28,6 +28,6 @@ class AgentProductItem extends BaseModel
 
 	public function agent()
 	{
-		return $this->belongsTo(Agent::class);
+		return $this->belongsTo(Agent::class)->withTrashed();
 	}
 }

app/Models/DemandProduct.php

@@ -42,7 +42,7 @@ class DemandProduct extends Model
 
 	public function supplier()
 	{
-		return $this->belongsTo(Supplier::class);
+		return $this->belongsTo(Supplier::class)->withTrashed();
 	}
 
 	public function category()

app/Models/DepositLog.php

@@ -16,6 +16,6 @@ class DepositLog extends Model
 
 	public function supplier()
 	{
-		return $this->belongsTo(Supplier::class);
+		return $this->belongsTo(Supplier::class)->withTrashed();
 	}
 }

app/Models/IndustryOrder.php

@@ -12,12 +12,12 @@ class IndustryOrder extends BaseModel
 
     public function supplier()
 	{
-		return $this->belongsTo(Supplier::class);
+		return $this->belongsTo(Supplier::class)->withTrashed();
 	}
 
     public function agent()
 	{
-		return $this->belongsTo(Agent::class);
+		return $this->belongsTo(Agent::class)->withTrashed();
 	}
 
     public function industryProduct()

app/Models/IndustryProduct.php

@@ -21,7 +21,7 @@ class IndustryProduct extends BaseModel
 
     public function supplier()
 	{
-		return $this->belongsTo(Supplier::class);
+		return $this->belongsTo(Supplier::class)->withTrashed();
 	}
 
 	public function category()

app/Models/OrderProductItem.php

@@ -28,11 +28,11 @@ class OrderProductItem extends BaseModel
 
 	public function supplier()
 	{
-		return $this->belongsTo(Supplier::class);
+		return $this->belongsTo(Supplier::class)->withTrashed();
 	}
 
 	public function agent()
 	{
-		return $this->belongsTo(Agent::class);
+		return $this->belongsTo(Agent::class)->withTrashed();
 	}
 }

app/Models/Product.php

@@ -42,7 +42,7 @@ class Product extends BaseModel
 
 	public function supplier()
 	{
-		return $this->belongsTo(Supplier::class);
+		return $this->belongsTo(Supplier::class)->withTrashed();
 	}
 
 	public function category()

app/Models/User.php

@@ -11,6 +11,6 @@ class User extends BaseModel
 
 	public function agent()
 	{
-		return $this->belongsTo(Agent::class);
+		return $this->belongsTo(Agent::class)->withTrashed();
 	}
 }

app/Models/UserMoneyLog.php

@@ -17,7 +17,7 @@ class UserMoneyLog extends BaseModel
 
 	public function agent()
 	{
-		return $this->belongsTo(Agent::class);
+		return $this->belongsTo(Agent::class)->withTrashed();
 	}
 
 	public function order()