From 787b7b61c9a46adad61f676f7be5601d58eb7185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BF=AB=E7=82=B9=E6=B4=97=E6=BE=A1=E7=9D=A1=E8=A7=89?=
 =?UTF-8?q?=E5=90=A7?= <16840517@qq.com>
Date: Mon, 12 Aug 2024 12:45:45 +0000
Subject: [PATCH 1/2] =?UTF-8?q?dictionary=E7=9A=84key=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E5=8F=AF=E9=80=89=E5=8F=82=E6=95=B0=E9=81=BF=E5=85=8D=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 快点洗澡睡觉吧 <16840517@qq.com>
---
 web/src/utils/dictionary.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/utils/dictionary.ts b/web/src/utils/dictionary.ts
index bdf98269..47383b3f 100644
--- a/web/src/utils/dictionary.ts
+++ b/web/src/utils/dictionary.ts
@@ -4,7 +4,7 @@ import { DictionaryStore } from '/@/stores/dictionary';
 /**
   * @method 获取指定name字典
   */
-export const dictionary = (name: string,key:string|number|undefined) => {
+export const dictionary = (name: string,key?:string|number|undefined) => {
   const dict = DictionaryStore()
   const dictionary = toRaw(dict.data)
   if(key!=undefined){
-- 
Gitee


From 7289e200e6574e0fab9b02302c33d29f5b7024b5 Mon Sep 17 00:00:00 2001
From: vFeng <1914007838@qq.com>
Date: Thu, 2 Jan 2025 03:15:15 +0000
Subject: [PATCH 2/2] =?UTF-8?q?[fix=E5=8F=96=E6=B6=88=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=BC=95=E5=85=A5dvadmin3=5Fcelery=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: vFeng <1914007838@qq.com>
---
 backend/application/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/application/settings.py b/backend/application/settings.py
index 1d0adf79..e6bdec5e 100644
--- a/backend/application/settings.py
+++ b/backend/application/settings.py
@@ -404,7 +404,7 @@ PLUGINS_URL_PATTERNS = []
 # ********** 一键导入插件配置开始 **********
 # 例如:
 # from dvadmin_upgrade_center.settings import *    # 升级中心
-from dvadmin3_celery.settings import *            # celery 异步任务
+# from dvadmin3_celery.settings import *            # celery 异步任务
 # from dvadmin_third.settings import *            # 第三方用户管理
 # from dvadmin_ak_sk.settings import *            # 秘钥管理管理
 # from dvadmin_tenants.settings import *            # 租户管理
-- 
Gitee