Merge remote-tracking branch 'origin/develop' into develop

# Conflicts: # backend/application/settings.py
2024-02-21 17:49:38 +08:00
parent 85805e0d4b 6798fca362
commit d4f754976e
5 changed files with 62 additions and 26 deletions
--- a/backend/application/settings.py
+++ b/backend/application/settings.py
@@ -404,7 +404,7 @@ PLUGINS_URL_PATTERNS = []
 # ********** 一键导入插件配置开始 **********
 # 例如:
 # from dvadmin_upgrade_center.settings import *    # 升级中心
-#from dvadmin_celery.settings import *            # celery 异步任务
+# from dvadmin_celery.settings import *            # celery 异步任务
 # from dvadmin_third.settings import *            # 第三方用户管理
 # from dvadmin_ak_sk.settings import *            # 秘钥管理管理
 # from dvadmin_tenants.settings import *            # 租户管理