Merge branch 'feature/mzl_dev' into develop

# Conflicts:
#	app/admin/service/SysDictService.php

app/common/model/StockOrders.php

@@ -89,4 +89,10 @@ class StockOrders extends Model
     {
         return $this->hasOne(VehMoneyValue::class, 'object_id', 'id')->where('object_scene', 'stock_orders');
     }
+
+
+    public function salesperson()
+    {
+        return $this->hasOne(User::class, 'id', 'salesperson_id');
+    }
 }

app/common/model/SysDict.php

@@ -56,4 +56,10 @@ class SysDict extends Model
     {
         return $this->hasMany(SysDictItem::class, 'dict_id', 'id');
     }
+
+
+    public function category()
+    {
+        return $this->belongsTo(SysDictCategory::class, 'category_id', 'id');
+    }
 }

app/common/model/SysDictCategory.php

@@ -46,4 +46,13 @@ class SysDictCategory extends Model
      * 不允许自动填充模型字段
      */
     protected $guarded = [];
+
+
+    public function dicts()
+    {
+        return $this->hasMany(SysDict::class, 'category_id', 'id')
+            ->where('status', 1)
+            ->whereNull('deleted_at')
+            ->orderBy('id', 'asc');
+    }
 }