diff --git a/backend/application/settings.py b/backend/application/settings.py index 1d0adf79b43c695cbb576518c213ea2837303a07..e6bdec5eaa5fa6bc0778592ace87c8da995262ef 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 * # 租户管理 diff --git a/web/src/utils/dictionary.ts b/web/src/utils/dictionary.ts index bdf982697a5acbc36e4066b58c09cf3b3e360413..47383b3fef255a820e8b2d16dfa7dc8211186162 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){