From f979b967a74bfdbfe7d2913a35ba98344838e59b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 14 Sep 2023 12:56:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

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

diff --git a/screen-api/src/main/resources/application-cjl.yml b/screen-api/src/main/resources/application-cjl.yml
index 0eb8c80..3f6305d 100644
--- a/screen-api/src/main/resources/application-cjl.yml
+++ b/screen-api/src/main/resources/application-cjl.yml
@@ -16,6 +16,8 @@
     include: bulletin, specialCity, announcement
   application:
     name: screen-api
+  main:
+    allow-bean-definition-overriding: true
   redis:
     host: r-bp1xdlb9wfc6zt0msppd13.redis.rds.aliyuncs.com
     port: 6379

--
Gitblit v1.8.0