From df14735715ed00a3921618397a5e9e9da6fbcb1e Mon Sep 17 00:00:00 2001 From: mzl Date: Tue, 9 Sep 2025 13:45:46 +0800 Subject: [PATCH] Merge branch 'develop' into feature/mzl_dev # Conflicts: # app/admin/service/SysDictService.php --- app/admin/service/SysDictService.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/admin/service/SysDictService.php b/app/admin/service/SysDictService.php index e46b07b..dfb7f53 100644 --- a/app/admin/service/SysDictService.php +++ b/app/admin/service/SysDictService.php @@ -8,6 +8,8 @@ use app\common\model\SysDict; use app\common\model\SysDictCategory; use app\common\utils\translation\service\TranslationService; use app\queue\utils\Translat; +use app\common\utils\translation\service\TranslationService; +use app\queue\utils\Translat; use support\Request; class SysDictService