From d643b843cc794d8f59c4ecd04bda2b9d35e5b22a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 十一月 2023 19:54:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-other/src/main/resources/bootstrap.properties |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cloud-server-other/src/main/resources/bootstrap.properties b/cloud-server-other/src/main/resources/bootstrap.properties
index 3458b3f..49416f0 100644
--- a/cloud-server-other/src/main/resources/bootstrap.properties
+++ b/cloud-server-other/src/main/resources/bootstrap.properties
@@ -18,7 +18,6 @@
 spring.cloud.nacos.discovery.group=@profiles.group@
 spring.main.allow-bean-definition-overriding=true
 spring.flyway.enabled=false
-
 # \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0479\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 feign.compression.request.mime-types=text/xml,application/xml,application/json
 feign.compression.request.min-request-size=4096
@@ -26,3 +25,4 @@
 feign.compression.response.enabled=true
 
 
+

--
Gitblit v1.7.1