From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码

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

diff --git a/cloud-server-management/src/main/resources/bootstrap.properties b/cloud-server-management/src/main/resources/bootstrap.properties
index 9d40542..533a23a 100644
--- a/cloud-server-management/src/main/resources/bootstrap.properties
+++ b/cloud-server-management/src/main/resources/bootstrap.properties
@@ -1,4 +1,4 @@
-spring.profiles.active=@pro files.active@
+spring.profiles.active=@profiles.active@
 spring.application.name=@artifactId@
 spring.cloud.nacos.username=@profiles.nacos-username@
 spring.cloud.nacos.password=@profiles.nacos-password@
@@ -29,4 +29,6 @@
 feign.compression.request.mime-types=text/xml,application/xml,application/json
 feign.compression.request.min-request-size=4096
 feign.compression.request.enabled=true
-feign.compression.response.enabled=true
\ No newline at end of file
+feign.compression.response.enabled=true
+
+mybatis-plus.configuration.map-underscore-to-camel-case=false
\ No newline at end of file

--
Gitblit v1.7.1