From 967f911721e3a7473ac9d6c90e533453751f3243 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Thu, 29 Oct 2020 10:26:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-config/src/main/resources/bootstrap.properties |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/kidgrow-config/src/main/resources/bootstrap.properties b/kidgrow-config/src/main/resources/bootstrap.properties
index 9eed521..4062430 100644
--- a/kidgrow-config/src/main/resources/bootstrap.properties
+++ b/kidgrow-config/src/main/resources/bootstrap.properties
@@ -7,4 +7,9 @@
 management.endpoint.health.show-details=always
 
 ##### \u5141\u8BB8bean\u8986\u76D6
-spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
+spring.main.allow-bean-definition-overriding=true
+
+#####\u5B57\u7B26\u7C7B\u578B#####
+spring.http.encoding.charset=UTF-8
+spring.http.encoding.enabled=true
+spring.http.encoding.force=true
\ No newline at end of file

--
Gitblit v1.8.0