Merge remote-tracking branch 'origin/dev' into dev

zhaoxiaohao

2020-08-08 4d9483cecdeb9e13a7ea4475121351b02058a51b

 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
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