Merge branch 'feature/mzl_dev' into develop

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