From 010f4ba252db180fc7fea4d7cb1b84a0bca7479f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 11 Aug 2023 16:37:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-api/src/main/resources/application-dev.yml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/resources/application-dev.yml b/screen-api/src/main/resources/application-dev.yml
index 8619aca..e8df1b7 100644
--- a/screen-api/src/main/resources/application-dev.yml
+++ b/screen-api/src/main/resources/application-dev.yml
@@ -16,6 +16,8 @@
     include: bulletin, specialCity, announcement
   application:
     name: screen-api
+  main:
+    allow-bean-definition-overriding: true
   redis:
     host: r-bp1xdlb9wfc6zt0msp05.redis.rds.aliyuncs.com
     port: 6379

--
Gitblit v1.8.0