Merge branch 'feature/mzl_dev' into develop

# Conflicts: # app/admin/service/SysDictService.php
2025-09-09 13:47:04 +08:00
parent 2cd613eea6
commit f5e93f2400
23 changed files with 1929 additions and 1427 deletions
@@ -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');
+    }
 }