From 4a4db8924da0782d0b698f7585ad6b0577bdca2d Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 06 Sep 2023 10:09:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/resources/application-qa.yml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/resources/application-qa.yml b/screen-api/src/main/resources/application-qa.yml
index 257eae4..ab0f0ae 100644
--- a/screen-api/src/main/resources/application-qa.yml
+++ b/screen-api/src/main/resources/application-qa.yml
@@ -18,6 +18,8 @@
include: bulletin, specialCity, announcement
application:
name: screen-api
+ main:
+ allow-bean-definition-overriding: true
redis:
host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
port: 6379
--
Gitblit v1.8.0